diff --git a/core/src/main/java/net/kuujo/copycat/resource/AbstractResource.java b/core/src/main/java/net/kuujo/copycat/resource/AbstractResource.java
index f0ee9c67e5..3dbd0533db 100644
--- a/core/src/main/java/net/kuujo/copycat/resource/AbstractResource.java
+++ b/core/src/main/java/net/kuujo/copycat/resource/AbstractResource.java
@@ -27,7 +27,7 @@
  */
 public abstract class AbstractResource<T extends Resource<?>> implements Resource<T> {
   protected final String name;
-  protected final ManagedCluster cluster;
+  private final ManagedCluster cluster;
 
   protected AbstractResource(ResourceConfig config) {
     this.name = config.getName();
diff --git a/core/src/main/java/net/kuujo/copycat/resource/DiscreteResource.java b/core/src/main/java/net/kuujo/copycat/resource/DiscreteResource.java
index 280e53c25e..897063c64a 100644
--- a/core/src/main/java/net/kuujo/copycat/resource/DiscreteResource.java
+++ b/core/src/main/java/net/kuujo/copycat/resource/DiscreteResource.java
@@ -30,7 +30,7 @@
  */
 public abstract class DiscreteResource<T extends DiscreteResource<?, U>, U extends Resource<?>> extends AbstractResource<U> {
   protected final Protocol protocol;
-  protected final Cluster partitionedCluster;
+  protected final Cluster cluster;
   protected final ReplicationStrategy replicationStrategy;
   protected final Serializer serializer;
 
@@ -39,10 +39,10 @@ protected DiscreteResource(DiscreteResourceConfig config) {
     this.protocol = config.getProtocol();
     this.replicationStrategy = config.getReplicationStrategy();
     this.serializer = config.getSerializer();
-    this.partitionedCluster = new PartitionedCluster(config.getCluster(), config.getReplicationStrategy(), config.getPartitionId(), config.getPartitions());
+    this.cluster = new PartitionedCluster(config.getCluster(), config.getReplicationStrategy(), config.getPartitionId(), config.getPartitions());
     protocol.setTopic(String.format("%s-%d", config.getName(), config.getPartitionId()));
-    protocol.setCluster(partitionedCluster);
-    protocol.setContext(new ExecutionContext(String.format("copycat-protocol-%s-%d-%d", config.getName(), config.getPartitionId(), partitionedCluster.member().id())));
+    protocol.setCluster(cluster);
+    protocol.setContext(new ExecutionContext(String.format("copycat-protocol-%s-%d-%d", config.getName(), config.getPartitionId(), cluster.member().id())));
   }
 
   /**
@@ -52,7 +52,7 @@ protected DiscreteResource(DiscreteResourceConfig config) {
 
   @Override
   public Cluster cluster() {
-    return partitionedCluster;
+    return cluster;
   }
 
   @Override