Finalized the caching tests

Author: Arshadf

core-api/src/main/java/com/optimizely/ab/Optimizely.java

@@ -88,7 +88,7 @@ public class Optimizely implements AutoCloseable {
 
     private final ProjectConfigManager projectConfigManager;
 
-    private OptimizelyConfigManager optimizelyConfigManager;
+    private final OptimizelyConfigManager optimizelyConfigManager;
 
     // TODO should be private
     public final NotificationCenter notificationCenter;
@@ -110,9 +110,7 @@ private Optimizely(@Nonnull EventHandler eventHandler,
         this.decisionService = decisionService;
         this.userProfileService = userProfileService;
         this.projectConfigManager = projectConfigManager;
-        if (projectConfigManager instanceof OptimizelyConfigManager) {
-            this.optimizelyConfigManager = (OptimizelyConfigManager)projectConfigManager;
-        }
+        this.optimizelyConfigManager = projectConfigManager instanceof OptimizelyConfigManager ? (OptimizelyConfigManager)projectConfigManager : null;
         this.notificationCenter = notificationCenter;
     }
 

core-api/src/main/java/com/optimizely/ab/config/PollingProjectConfigManager.java

@@ -103,7 +103,7 @@ void setConfig(ProjectConfig projectConfig) {
         logger.info("New datafile set with revision: {}. Old revision: {}", projectConfig.getRevision(), previousRevision);
 
         currentProjectConfig.set(projectConfig);
-        currentOptimizelyConfig.set(new OptimizelyConfigService(currentProjectConfig.get()).getConfig());
+        currentOptimizelyConfig.set(new OptimizelyConfigService(projectConfig).getConfig());
         countDownLatch.countDown();
         notificationCenter.send(SIGNAL);
     }