diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTarget.java b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTarget.java
index c4cdfa54f..6d35acd19 100644
--- a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTarget.java
+++ b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTarget.java
@@ -55,7 +55,7 @@ public class CFTarget {
 			}
 		};
 		this.servicesCache = CacheBuilder.newBuilder()
-				.expireAfterAccess(CFTargetCache.EXPIRATION_20_SECS, TimeUnit.SECONDS).build(servicesLoader);
+				.expireAfterAccess(CFTargetCache.SERVICES_EXPIRATION, TimeUnit.SECONDS).build(servicesLoader);
 
 		CacheLoader<String, List<CFBuildpack>> buildpacksLoader = new CacheLoader<String, List<CFBuildpack>>() {
 
@@ -68,7 +68,7 @@ public class CFTarget {
 			}
 		};
 		this.buildpacksCache = CacheBuilder.newBuilder()
-				.expireAfterAccess(CFTargetCache.EXPIRATION_1_HOUR, TimeUnit.HOURS).build(buildpacksLoader);
+				.expireAfterAccess(CFTargetCache.TARGET_EXPIRATION, TimeUnit.HOURS).build(buildpacksLoader);
 	}
 
 	public CFClientParams getParams() {
diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTargetCache.java b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTargetCache.java
index ea194edd7..3bbe48630 100644
--- a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTargetCache.java
+++ b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTargetCache.java
@@ -29,8 +29,8 @@ public class CFTargetCache {
 	private final ClientTimeouts timeouts;
 	private final LoadingCache<CFClientParams, CFTarget> cache;
 
-	public static final long EXPIRATION_20_SECS = 20;
-	public static final long EXPIRATION_1_HOUR = 1;
+	public static final long SERVICES_EXPIRATION = 10;
+	public static final long TARGET_EXPIRATION = 1;
 
 	public CFTargetCache(ClientParamsProvider paramsProvider, CloudFoundryClientFactory clientFactory,
 			ClientTimeouts timeouts) {
@@ -47,7 +47,7 @@ public class CFTargetCache {
 			}
 
 		};
-		cache = CacheBuilder.newBuilder().expireAfterAccess(EXPIRATION_1_HOUR, TimeUnit.HOURS).build(loader);
+		cache = CacheBuilder.newBuilder().expireAfterAccess(TARGET_EXPIRATION, TimeUnit.HOURS).build(loader);
 	}
 
 	/**