diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java
index 5a78eb7f9..0b65609dc 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractCassandraConfiguration.java
@@ -49,6 +49,7 @@
  * @author Matthew T. Adams
  * @author John Blum
  * @author Mark Paluch
+ * @author Ammar Khaku
  */
 @Configuration
 @SuppressWarnings("unused")
@@ -71,14 +72,11 @@ public CassandraConverter cassandraConverter() {
 
 		CqlSession cqlSession = getRequiredSession();
 
-		UserTypeResolver userTypeResolver =
-				new SimpleUserTypeResolver(cqlSession, CqlIdentifier.fromCql(getKeyspaceName()));
-
 		MappingCassandraConverter converter =
 			new MappingCassandraConverter(requireBeanOfType(CassandraMappingContext.class));
 
 		converter.setCodecRegistry(cqlSession.getContext().getCodecRegistry());
-		converter.setUserTypeResolver(userTypeResolver);
+		converter.setUserTypeResolver(userTypeResolver(cqlSession));
 		converter.setCustomConversions(requireBeanOfType(CassandraCustomConversions.class));
 
 		return converter;
@@ -96,11 +94,8 @@ public CassandraMappingContext cassandraMapping() throws ClassNotFoundException
 
 		CqlSession cqlSession = getRequiredSession();
 
-		UserTypeResolver userTypeResolver =
-				new SimpleUserTypeResolver(cqlSession, CqlIdentifier.fromCql(getKeyspaceName()));
-
 		CassandraMappingContext mappingContext =
-			new CassandraMappingContext(userTypeResolver, SimpleTupleTypeFactory.DEFAULT);
+			new CassandraMappingContext(userTypeResolver(cqlSession), SimpleTupleTypeFactory.DEFAULT);
 
 		CustomConversions customConversions = requireBeanOfType(CassandraCustomConversions.class);
 
@@ -260,4 +255,8 @@ protected KeyspacePopulator keyspacePopulator() {
 	protected ByteArrayResource scriptOf(String content) {
 		return new ByteArrayResource(content.getBytes());
 	}
+
+	protected UserTypeResolver userTypeResolver(CqlSession cqlSession) {
+		return new SimpleUserTypeResolver(cqlSession, CqlIdentifier.fromCql(getKeyspaceName()));
+	}
 }