diff --git a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
index 6300e3a82..5a1d93290 100644
--- a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
+++ b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
@@ -354,12 +354,12 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 
 			read.lock();
 
-			Optional<E> persistentEntity = persistentEntities.computeIfAbsent(typeInformation,
-					it -> persistentEntities.get(typeInformation.getUserTypeInformation()));
+			Optional<E> persistentEntity = persistentEntities.get(typeInformation);
 
 			if (persistentEntity != null) {
 				return persistentEntity;
 			}
+
 		} finally {
 			read.unlock();
 		}
@@ -370,12 +370,15 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 
 			write.lock();
 
-			TypeInformation<?> typeInformationToUse = typeInformation.getUserTypeInformation();
-			entity = doAddPersistentEntity(typeInformation.getUserTypeInformation());
+			Optional<E> userTypeEntity = persistentEntities.get(typeInformation.getUserTypeInformation());
 
-			if (!typeInformationToUse.equals(typeInformation)) {
-				persistentEntities.put(typeInformation, Optional.of(entity));
+			if (userTypeEntity != null) {
+				persistentEntities.put(typeInformation, userTypeEntity);
+				return userTypeEntity;
 			}
+
+			entity = doAddPersistentEntity(typeInformation);
+
 		} catch (BeansException e) {
 			throw new MappingException(e.getMessage(), e);
 		} finally {
@@ -392,19 +395,26 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 
 	private E doAddPersistentEntity(TypeInformation<?> typeInformation) {
 
+		TypeInformation<?> userTypeInformation = typeInformation.getUserTypeInformation();
+
 		try {
 
-			Class<?> type = typeInformation.getType();
+			Class<?> type = userTypeInformation.getType();
 
-			E entity = createPersistentEntity(typeInformation);
+			E entity = createPersistentEntity(userTypeInformation);
 			entity.setEvaluationContextProvider(evaluationContextProvider);
 
 			// Eagerly cache the entity as we might have to find it during recursive lookups.
-			persistentEntities.put(typeInformation, Optional.of(entity));
+			persistentEntities.put(userTypeInformation, Optional.of(entity));
+
+			// Cache original TypeInformation as well.
+			if (!userTypeInformation.equals(typeInformation)) {
+				persistentEntities.put(typeInformation, Optional.of(entity));
+			}
 
 			PropertyDescriptor[] pds = BeanUtils.getPropertyDescriptors(type);
-
 			Map<String, PropertyDescriptor> descriptors = new HashMap<>();
+
 			for (PropertyDescriptor descriptor : pds) {
 				descriptors.put(descriptor.getName(), descriptor);
 			}
@@ -420,8 +430,12 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 			}
 
 			return entity;
+
 		} catch (RuntimeException e) {
+
+			persistentEntities.remove(userTypeInformation);
 			persistentEntities.remove(typeInformation);
+
 			throw e;
 		}
 	}
diff --git a/src/main/java/org/springframework/data/util/ClassTypeInformation.java b/src/main/java/org/springframework/data/util/ClassTypeInformation.java
index 953b60fee..de575ad66 100644
--- a/src/main/java/org/springframework/data/util/ClassTypeInformation.java
+++ b/src/main/java/org/springframework/data/util/ClassTypeInformation.java
@@ -32,7 +32,6 @@ import org.springframework.core.GenericTypeResolver;
 import org.springframework.util.Assert;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.util.ConcurrentReferenceHashMap.ReferenceType;
-import org.springframework.util.ObjectUtils;
 
 /**
  * {@link TypeInformation} for a plain {@link Class}.
@@ -91,7 +90,7 @@ public class ClassTypeInformation<S> extends TypeDiscoverer<S> {
 	 * @param type
 	 */
 	ClassTypeInformation(Class<S> type) {
-		super(ProxyUtils.getUserClass(type), getTypeVariableMap(type));
+		super(type, getTypeVariableMap(type));
 		this.type = type;
 	}
 
@@ -178,26 +177,4 @@ public class ClassTypeInformation<S> extends TypeDiscoverer<S> {
 	public String toString() {
 		return type.getName();
 	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-
-		if (!super.equals(o)) {
-			return false;
-		}
-
-		ClassTypeInformation<?> that = (ClassTypeInformation<?>) o;
-		return ObjectUtils.nullSafeEquals(type, that.type);
-	}
-
-	@Override
-	public int hashCode() {
-
-		int result = super.hashCode();
-		result = 31 * result + ObjectUtils.nullSafeHashCode(type);
-		return result;
-	}
 }
diff --git a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
index 7b4f59614..905d25020 100755
--- a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
+++ b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
@@ -39,7 +39,6 @@ import java.util.function.Supplier;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.springframework.aop.SpringProxy;
 import org.springframework.aop.framework.Advised;
 import org.springframework.context.ApplicationContext;
@@ -343,6 +342,7 @@ class AbstractMappingContextUnitTests {
 		assertThat(context.hasPersistentEntityFor(Base$$SpringProxy$873fa2e.class)).isTrue();
 
 		assertThat(context.getPersistentEntities()).hasSize(1); // only one distinct instance
+		assertThat(persistentEntity).isSameAs(persistentEntityForProxy);
 	}
 
 	@Test // GH-2485
@@ -362,6 +362,7 @@ class AbstractMappingContextUnitTests {
 		persistentEntity.getTypeInformation().getType().equals(Base.class);
 
 		assertThat(context.getPersistentEntities()).hasSize(1); // only one distinct instance
+		assertThat(persistentEntity).isSameAs(persistentEntityForProxy);
 	}
 
 	private static void assertHasEntityFor(Class<?> type, SampleMappingContext context, boolean expected) {