1 files changed, 2 insertions, 12 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
index 852d47a4882..8b66b7f3fea 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
@@ -81,7 +81,6 @@ public class NodeRepository extends AbstractComponent {
     private final NameResolver nameResolver;
     private final DockerImage dockerImage;
     private final OsVersions osVersions;
-    private final Flags flags;
 
     /**
      * Creates a node repository from a zookeeper provider.
@@ -98,28 +97,19 @@ public class NodeRepository extends AbstractComponent {
      */
     public NodeRepository(NodeFlavors flavors, Curator curator, Clock clock, Zone zone, NameResolver nameResolver,
                           DockerImage dockerImage, boolean useCuratorClientCache) {
-        this.db = new CuratorDatabaseClient(flavors, curator, clock, zone, useCacheIn(zone, useCuratorClientCache));
+        this.db = new CuratorDatabaseClient(flavors, curator, clock, zone, useCuratorClientCache);
         this.zone = zone;
         this.clock = clock;
         this.flavors = flavors;
         this.nameResolver = nameResolver;
         this.dockerImage = dockerImage;
         this.osVersions = new OsVersions(this.db);
-        this.flags = new Flags(this.db);
 
         // read and write all nodes to make sure they are stored in the latest version of the serialized format
         for (Node.State state : Node.State.values())
             db.writeTo(state, db.getNodes(state), Agent.system, Optional.empty());
     }
 
-    private static boolean useCacheIn(Zone zone, boolean useCache) {
-        if (zone.region().value().equals("cd-us-central-1")) {
-            // TODO: Temporarily disabled in CD to see if allocation conflict is related to caching
-            return false;
-        }
-        return useCache;
-    }
-
     /** Returns the curator database client used by this */
     public CuratorDatabaseClient database() { return db; }
 
@@ -134,7 +124,7 @@ public class NodeRepository extends AbstractComponent {
 
     /** Returns feature flags of this node repository */
     public Flags flags() {
-        return flags;
+        return db.flags();
     }
 
     // ---------------- Query API ----------------------------------------------------------------