diff --git a/zuul-netflix/src/main/java/com/netflix/zuul/dependency/cassandra/CassandraHelper.java b/zuul-netflix/src/main/java/com/netflix/zuul/dependency/cassandra/CassandraHelper.java
index d2ee147786..1c5f81eaf6 100644
--- a/zuul-netflix/src/main/java/com/netflix/zuul/dependency/cassandra/CassandraHelper.java
+++ b/zuul-netflix/src/main/java/com/netflix/zuul/dependency/cassandra/CassandraHelper.java
@@ -87,7 +87,7 @@ public Keyspace getZuulCassKeyspace() throws Exception {
                     .buildKeyspace(ThriftFamilyFactory.getInstance());
 
             context.start();
-            zuulCassKeyspace = context.getEntity();
+            zuulCassKeyspace = context.getClient();
             return zuulCassKeyspace;
         } catch (Exception e) {
             LOG.error("Exception occurred when initializing Cassandra keyspace: " + e);
diff --git a/zuul-netflix/src/main/java/com/netflix/zuul/scriptManager/ZuulFilterDAOCassandra.java b/zuul-netflix/src/main/java/com/netflix/zuul/scriptManager/ZuulFilterDAOCassandra.java
index caef2de973..3edff9cbbf 100644
--- a/zuul-netflix/src/main/java/com/netflix/zuul/scriptManager/ZuulFilterDAOCassandra.java
+++ b/zuul-netflix/src/main/java/com/netflix/zuul/scriptManager/ZuulFilterDAOCassandra.java
@@ -502,7 +502,7 @@ private static class CassandraGatewayProd implements CassandraGateway {
 
 
         public CassandraGatewayProd(AstyanaxContext<Keyspace> context) {
-            keyspace = context.getEntity();
+            keyspace = context.getClient();
         }
 
         public CassandraGatewayProd(Keyspace keyspace) {