/**
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.apache.camel.impl.cloud;

import java.util.List;
import java.util.concurrent.TimeUnit;

import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.cloud.ServiceDiscovery;
import org.apache.camel.util.ObjectHelper;

public final class CachingServiceDiscovery implements ServiceDiscovery {
    private final ServiceDiscovery delegate;
    private LoadingCache<String, List<ServiceDefinition>> cache;
    private long timeout;

    public CachingServiceDiscovery(ServiceDiscovery delegate) {
        this(delegate, 60 * 1000);
    }

    public CachingServiceDiscovery(ServiceDiscovery delegate, long timeout, TimeUnit unit) {
        this(delegate, unit.toMillis(timeout));
    }

    public CachingServiceDiscovery(ServiceDiscovery delegate, long timeout) {
        this.delegate = ObjectHelper.notNull(delegate, "delegate");
        setTimeout(timeout);
    }

    public ServiceDiscovery getDelegate() {
        return this.delegate;
    }

    public void setTimeout(long timeout) {
        this.timeout = timeout;
        this.cache = Caffeine.newBuilder()
            .expireAfterAccess(timeout, TimeUnit.MILLISECONDS)
            .build(delegate::getServices);
    }

    public void setTimeout(long timeout, TimeUnit unit) {
        setTimeout(unit.toMillis(timeout));
    }

    public long getTimeout() {
        return timeout;
    }

    public CachingServiceDiscovery timeout(long timeout) {
        setTimeout(timeout);
        return this;
    }

    public CachingServiceDiscovery timeout(long timeout, TimeUnit unit) {
        setTimeout(timeout, unit);
        return this;
    }

    @Override
    public List<ServiceDefinition> getServices(String name) {
        return delegate.getServices(name);
    }

    // **********************
    // Helpers
    // **********************

    public static CachingServiceDiscovery wrap(ServiceDiscovery delegate) {
        return new CachingServiceDiscovery(delegate);
    }

    public static CachingServiceDiscovery wrap(ServiceDiscovery delegate, long timeout) {
        return new CachingServiceDiscovery(delegate).timeout(timeout);
    }

    public static CachingServiceDiscovery wrap(ServiceDiscovery delegate, long timeout, TimeUnit unit) {
        return new CachingServiceDiscovery(delegate).timeout(timeout, unit);
    }
}

@@ -2623,28 +2623,17 @@
 urn 
-delegate.getServices
+cache.get
 (nam

Fix tests