diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java
index 8e73190780..a078978dae 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java
@@ -45,6 +45,8 @@ public class RedisMessageStore extends AbstractKeyValueMessageStore implements B
 
 	private final RedisTemplate<Object, Object> redisTemplate;
 
+	private final boolean unlinkAvailable;
+
 	private boolean valueSerializerSet;
 
 	/**
@@ -72,6 +74,7 @@ public class RedisMessageStore extends AbstractKeyValueMessageStore implements B
 		this.redisTemplate.setKeySerializer(new StringRedisSerializer());
 		this.redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());
 		this.redisTemplate.afterPropertiesSet();
+		this.unlinkAvailable = RedisUtils.isUnlinkAvailable(this.redisTemplate);
 	}
 
 	@Override
@@ -131,7 +134,7 @@ public class RedisMessageStore extends AbstractKeyValueMessageStore implements B
 		Assert.notNull(id, "'id' must not be null");
 		Object removedObject = this.doRetrieve(id);
 		if (removedObject != null) {
-			if (RedisUtils.isUnlinkAvailable(this.redisTemplate)) {
+			if (this.unlinkAvailable) {
 				this.redisTemplate.unlink(id);
 			}
 			else {
@@ -143,7 +146,7 @@ public class RedisMessageStore extends AbstractKeyValueMessageStore implements B
 
 	@Override
 	protected void doRemoveAll(Collection<Object> ids) {
-		if (RedisUtils.isUnlinkAvailable(this.redisTemplate)) {
+		if (this.unlinkAvailable) {
 			this.redisTemplate.unlink(ids);
 		}
 		else {
diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java
index 49f18ed748..48f097ec1b 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java
@@ -97,6 +97,8 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
 
 	private final String registryKey;
 
+	private final boolean unlinkAvailable;
+
 	private final StringRedisTemplate redisTemplate;
 
 	private final RedisScript<Boolean> obtainLockScript;
@@ -138,6 +140,7 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
 		this.obtainLockScript = new DefaultRedisScript<>(OBTAIN_LOCK_SCRIPT, Boolean.class);
 		this.registryKey = registryKey;
 		this.expireAfter = expireAfter;
+		this.unlinkAvailable = RedisUtils.isUnlinkAvailable(this.redisTemplate);
 	}
 
 	/**
@@ -184,6 +187,8 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
 
 		private final ReentrantLock localLock = new ReentrantLock();
 
+		private final boolean unlinkAvailable = RedisLockRegistry.this.unlinkAvailable;
+
 		private volatile long lockedAt;
 
 		private RedisLock(String path) {
@@ -329,7 +334,7 @@ public final class RedisLockRegistry implements ExpirableLockRegistry, Disposabl
 		}
 
 		private void removeLockKey() {
-			if (RedisUtils.isUnlinkAvailable(RedisLockRegistry.this.redisTemplate)) {
+			if (this.unlinkAvailable) {
 				RedisLockRegistry.this.redisTemplate.unlink(this.lockKey);
 			}
 			else {
diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisUtils.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisUtils.java
index 7e8e43de55..b84d1664ac 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisUtils.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisUtils.java
@@ -16,6 +16,7 @@
 
 package org.springframework.integration.redis.util;
 
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -41,14 +42,14 @@ public final class RedisUtils {
 
 	@SuppressWarnings("serial")
 	private static final Map<RedisOperations<?, ?>, Boolean> unlinkAvailable =
-			new LinkedHashMap<RedisOperations<?, ?>, Boolean>() {
+			Collections.synchronizedMap(new LinkedHashMap<RedisOperations<?, ?>, Boolean>() {
 
 				@Override
 				protected boolean removeEldestEntry(Entry<RedisOperations<?, ?>, Boolean> eldest) {
 					return size() > 100;
 				}
 
-			};
+			});
 
 	/**
 	 * Perform an {@code INFO} command on the provided {@link RedisOperations} to check