diff --git a/OpenICF-java-framework/connector-framework-server/src/main/java/org/forgerock/openicf/framework/remote/ManagedAsyncConnectorInfoManager.java b/OpenICF-java-framework/connector-framework-server/src/main/java/org/forgerock/openicf/framework/remote/ManagedAsyncConnectorInfoManager.java
index fb7dd3b3..b565e8bb 100644
--- a/OpenICF-java-framework/connector-framework-server/src/main/java/org/forgerock/openicf/framework/remote/ManagedAsyncConnectorInfoManager.java
+++ b/OpenICF-java-framework/connector-framework-server/src/main/java/org/forgerock/openicf/framework/remote/ManagedAsyncConnectorInfoManager.java
@@ -186,12 +186,13 @@ public Promise<ConnectorInfo, RuntimeException> findConnectorInfoAsync(
                 final Pair<ConnectorKeyRange, PromiseImpl<ConnectorInfo, RuntimeException>> cacheEntry =
                         Pair.of(keyRange, PromiseImpl.<ConnectorInfo, RuntimeException> create());
 
+                rangePromiseCacheList.add(cacheEntry);
                 cacheEntry.getValue().thenOnResultOrException(new Runnable() {
                     public void run() {
                         rangePromiseCacheList.remove(cacheEntry);
                     }
                 });
-                rangePromiseCacheList.add(cacheEntry);
+
 
                 for (Map.Entry<ConnectorKey, ConnectorEntry<V>> entry : managedConnectorInfos
                         .entrySet()) {