diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java
index a732a635b..b8d831e4c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java
@@ -53,7 +53,7 @@ public class CachingMongoPersistentProperty extends BasicMongoPersistentProperty
 		if (this.isIdProperty == null) {
 			this.isIdProperty = super.isIdProperty();
 		}
-		
+
 		return this.isIdProperty;
 	}
 
@@ -67,7 +67,7 @@ public class CachingMongoPersistentProperty extends BasicMongoPersistentProperty
 		if (this.fieldName == null) {
 			this.fieldName = super.getFieldName();
 		}
-		
-		return super.getFieldName();
+
+		return this.fieldName;
 	}
 }