diff --git a/src/main/java/org/springframework/data/convert/CustomConversions.java b/src/main/java/org/springframework/data/convert/CustomConversions.java
index f6d7bd3dd..45d70fe81 100644
--- a/src/main/java/org/springframework/data/convert/CustomConversions.java
+++ b/src/main/java/org/springframework/data/convert/CustomConversions.java
@@ -536,11 +536,7 @@ public class CustomConversions {
 		public Class<?> computeIfAbsent(Class<?> sourceType, Class<?> targetType,
 				Function<ConvertiblePair, Class<?>> mappingFunction) {
 
-			TargetTypes targetTypes = customReadTargetTypes.get(sourceType);
-
-			if (targetTypes == null) {
-				targetTypes = customReadTargetTypes.computeIfAbsent(sourceType, TargetTypes::new);
-			}
+			TargetTypes targetTypes = customReadTargetTypes.computeIfAbsent(sourceType, TargetTypes::new);
 
 			return targetTypes.computeIfAbsent(targetType, mappingFunction);
 		}
diff --git a/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java b/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java
index 847701e04..35dec3f55 100644
--- a/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java
+++ b/src/main/java/org/springframework/data/convert/DefaultTypeMapper.java
@@ -124,14 +124,7 @@ public class DefaultTypeMapper<S> implements TypeMapper<S>, BeanClassLoaderAware
 	 */
 	@Nullable
 	private TypeInformation<?> getFromCacheOrCreate(Alias alias) {
-
-		Optional<TypeInformation<?>> typeInformation = typeCache.get(alias);
-
-		if (typeInformation == null) {
-			typeInformation = typeCache.computeIfAbsent(alias, getAlias);
-		}
-
-		return typeInformation.orElse(null);
+		return typeCache.computeIfAbsent(alias, getAlias).orElse(null);
 	}
 
 	@Override