diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java
index fec052359..0c3e2ec78 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.cassandra.core.mapping;
 
-
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 import java.util.stream.StreamSupport;
 
@@ -84,8 +84,9 @@ public class CassandraMappingContext
 	// caches
 	private final Map<CqlIdentifier, Set<CassandraPersistentEntity<?>>> entitySetsByTableName = new ConcurrentHashMap<>();
 
-	private final Set<BasicCassandraPersistentEntity<?>> tableEntities = new HashSet<>();
-	private final Set<BasicCassandraPersistentEntity<?>> userDefinedTypes = new HashSet<>();
+	private final Set<BasicCassandraPersistentEntity<?>> tableEntities = ConcurrentHashMap.newKeySet();
+
+	private final Set<BasicCassandraPersistentEntity<?>> userDefinedTypes = ConcurrentHashMap.newKeySet();
 
 	/**
 	 * Create a new {@link CassandraMappingContext}.
@@ -295,7 +296,7 @@ public class CassandraMappingContext
 			// now do some caching of the entity
 
 			Set<CassandraPersistentEntity<?>> entities = this.entitySetsByTableName.computeIfAbsent(entity.getTableName(),
-					cqlIdentifier -> new HashSet<>());
+					cqlIdentifier -> ConcurrentHashMap.newKeySet());
 
 			entities.add(entity);
 
@@ -434,7 +435,7 @@ public class CassandraMappingContext
 		Assert.notNull(tableName, "Table name must not be null");
 		Assert.notNull(entity, "CassandraPersistentEntity must not be null");
 
-		CreateTableSpecification specification = createTable(tableName);
+		CreateTableSpecification specification = CreateTableSpecification.createTable(tableName);
 
 		for (CassandraPersistentProperty property : entity) {