diff --git a/pom.xml b/pom.xml
index 3cdf95c42..910a7edd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 		<beanutils>1.9.2</beanutils>
 		<xstream>1.4.8</xstream>
 		<pool>2.2</pool>
-		<lettuce>5.1.5.RELEASE</lettuce>
+		<lettuce>5.1.6.RELEASE</lettuce>
 		<jedis>2.9.3</jedis>
 		<multithreadedtc>1.01</multithreadedtc>
 		<netty>4.1.22.Final</netty>
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java
index 2fc311402..8bb6d41ce 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java
@@ -982,7 +982,7 @@ public class LettuceConnectionFactory
 				.map(ClusterClientOptions.class::cast) //
 				.orElseGet(() -> {
 					return clientOptions //
-							.map(LettuceConnectionFactory::toClusterClientOptions) //
+							.map(it -> ClusterClientOptions.builder(it).build()) //
 							.orElseGet(ClusterClientOptions::create);
 				});
 
@@ -993,22 +993,6 @@ public class LettuceConnectionFactory
 		return clusterClientOptions;
 	}
 
-	// TODO: Replace with Lettuce 5.1.6 ClusterClientOptions.builder(ClientOptions)
-	private static ClusterClientOptions toClusterClientOptions(ClientOptions it) {
-
-		return ClusterClientOptions.builder() //
-				.autoReconnect(it.isAutoReconnect()) //
-				.cancelCommandsOnReconnectFailure(it.isCancelCommandsOnReconnectFailure()) //
-				.disconnectedBehavior(it.getDisconnectedBehavior()) //
-				.pingBeforeActivateConnection(it.isPingBeforeActivateConnection()) //
-				.requestQueueSize(it.getRequestQueueSize()) //
-				.socketOptions(it.getSocketOptions()) //
-				.sslOptions(it.getSslOptions()) //
-				.suspendReconnectOnProtocolFailure(it.isSuspendReconnectOnProtocolFailure())//
-				.timeoutOptions(it.getTimeoutOptions()) //
-				.build();
-	}
-
 	private RedisURI getSentinelRedisURI() {
 
 		RedisURI redisUri = LettuceConverters.sentinelConfigurationToRedisURI(