diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java
index a2a74cff5..cd71c5f97 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java
@@ -90,13 +90,14 @@ import com.datastax.driver.core.querybuilder.Update;
 public class MappingCassandraConverter extends AbstractCassandraConverter
 		implements CassandraConverter, ApplicationContextAware, BeanClassLoaderAware {
 
-	protected ApplicationContext applicationContext;
-	protected final CassandraMappingContext mappingContext;
-	protected ClassLoader beanClassLoader;
-	protected SpELContext spELContext;
-
 	private final Logger log = LoggerFactory.getLogger(getClass());
 
+	private final CassandraMappingContext mappingContext;
+
+	private ClassLoader beanClassLoader;
+
+	private SpELContext spELContext;
+
 	/**
 	 * Create a new {@link MappingCassandraConverter} with a {@link BasicCassandraMappingContext}.
 	 */
@@ -124,7 +125,6 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
 	 */
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		this.applicationContext = applicationContext;
 		this.spELContext = new SpELContext(this.spELContext, applicationContext);
 	}
 
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java
index f9fd70df2..c100c8961 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java
@@ -38,6 +38,7 @@ public class MappingCassandraEntityInformation<T, ID> extends AbstractEntityInfo
 		implements CassandraEntityInformation<T, ID> {
 
 	private final CassandraPersistentEntity<T> entityMetadata;
+
 	private final CassandraConverter converter;
 
 	/**
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java
index 553cf93ac..fb6d58756 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java
@@ -43,9 +43,9 @@ import com.datastax.driver.core.querybuilder.Select;
  */
 public class SimpleCassandraRepository<T, ID> implements TypedIdCassandraRepository<T, ID> {
 
-	private CassandraEntityInformation<T, ID> entityInformation;
+	private final CassandraEntityInformation<T, ID> entityInformation;
 
-	private CassandraOperations operations;
+	private final CassandraOperations operations;
 
 	/**
 	 * Create a new {@link SimpleCassandraRepository} for the given {@link CassandraEntityInformation} and
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java
index dd093951a..6de0097cf 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java
@@ -42,9 +42,9 @@ import com.datastax.driver.core.querybuilder.Select;
  */
 public class SimpleReactiveCassandraRepository<T, ID> implements ReactiveCassandraRepository<T, ID> {
 
-	protected CassandraEntityInformation<T, ID> entityInformation;
+	private final CassandraEntityInformation<T, ID> entityInformation;
 
-	protected ReactiveCassandraOperations operations;
+	private final ReactiveCassandraOperations operations;
 
 	/**
 	 * Create a new {@link SimpleReactiveCassandraRepository} for the given {@link CassandraEntityInformation} and