diff --git a/pom.xml b/pom.xml
index ff9b1016e..199d655bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
 		<build.cassandra.ssl_storage_port>17001</build.cassandra.ssl_storage_port>
 		<build.cassandra.storage_port>17000</build.cassandra.storage_port>
 		<cassandra.version>3.11.5</cassandra.version>
-		<cassandra-driver.version>4.6.1</cassandra-driver.version>
+		<cassandra-driver.version>4.7.0</cassandra-driver.version>
 		<dist.id>spring-data-cassandra</dist.id>
 		<el.version>1.0</el.version>
 		<!-- NOTE: com.carrotsearch:hppc dependency version set to same version as Apache Cassandra 3.11.5 -->
diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java
index 65e3589bc..a274ff91f 100644
--- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java
+++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/AbstractSessionConfiguration.java
@@ -290,8 +290,7 @@ public abstract class AbstractSessionConfiguration implements BeanFactoryAware {
 
 				if (StringUtils.hasText(getSessionName())) {
 					options.add(DefaultDriverOption.SESSION_NAME, getSessionName());
-				}
-				else if (StringUtils.hasText(getClusterName())) {
+				} else if (StringUtils.hasText(getClusterName())) {
 					options.add(DefaultDriverOption.SESSION_NAME, getClusterName());
 				}
 
@@ -303,12 +302,11 @@ public abstract class AbstractSessionConfiguration implements BeanFactoryAware {
 
 				ConfigFactory.invalidateCaches();
 
-				return ConfigFactory.defaultOverrides()
-						.withFallback(options.build())
-						.withFallback(ConfigFactory.defaultReference())
-						.resolve();
+				return ConfigFactory.defaultOverrides().withFallback(options.build()) //
+						.withFallback(ConfigFactory.defaultReference()) //
+						.getConfig(DefaultDriverConfigLoader.DEFAULT_ROOT_PATH);
 
-			}, DefaultDriverConfigLoader.DEFAULT_ROOT_PATH);
+			});
 
 			sessionBuilder.withConfigLoader(builder.build());