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 1d9328ac9..70eadc58d 100644
--- a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
+++ b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
@@ -218,9 +218,34 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 
 		Assert.notNull(type, "Type must not be null!");
 
-		Optional<E> entity = persistentEntities.get(ClassTypeInformation.from(type));
+		TypeInformation<?> typeInformation = ClassTypeInformation.from(type);
 
-		return entity == null ? false : entity.isPresent();
+		try {
+
+			read.lock();
+
+			// Try the original type first
+			Optional<E> entity = persistentEntities.get(typeInformation);
+
+			if (entity != null) {
+				return entity.isPresent();
+			}
+
+			// User type is the same?
+			TypeInformation<?> userTypeInformation = typeInformation.getUserTypeInformation();
+
+			if (userTypeInformation.equals(typeInformation)) {
+				return false;
+			}
+
+			// Try the user type
+			entity = persistentEntities.get(typeInformation.getUserTypeInformation());
+
+			return entity == null ? false : entity.isPresent();
+
+		} finally {
+			read.unlock();
+		}
 	}
 
 	/*
@@ -760,7 +785,8 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 			 */
 			public PropertyMatch(@Nullable String namePattern, @Nullable String typeName) {
 
-				Assert.isTrue(!(namePattern == null && typeName == null), "Either name pattern or type name must be given!");
+				Assert.isTrue(!((namePattern == null) && (typeName == null)),
+						"Either name pattern or type name must be given!");
 
 				this.namePattern = namePattern;
 				this.typeName = typeName;
@@ -778,11 +804,11 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 				Assert.notNull(name, "Name must not be null!");
 				Assert.notNull(type, "Type must not be null!");
 
-				if (namePattern != null && !name.matches(namePattern)) {
+				if ((namePattern != null) && !name.matches(namePattern)) {
 					return false;
 				}
 
-				if (typeName != null && !type.getName().equals(typeName)) {
+				if ((typeName != null) && !type.getName().equals(typeName)) {
 					return false;
 				}
 
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 53cb696a5..3464a28b7 100755
--- a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
+++ b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextUnitTests.java
@@ -334,7 +334,7 @@ class AbstractMappingContextUnitTests {
 		persistentEntity.getTypeInformation().getType().equals(Base.class);
 
 		assertThat(context.hasPersistentEntityFor(Base.class)).isTrue();
-		assertThat(context.hasPersistentEntityFor(Base$$SpringProxy$873fa2e.class)).isFalse();
+		assertThat(context.hasPersistentEntityFor(Base$$SpringProxy$873fa2e.class)).isTrue();
 
 		BasicPersistentEntity<Object, SamplePersistentProperty> persistentEntityForProxy = context
 				.getRequiredPersistentEntity(Base$$SpringProxy$873fa2e.class);