diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/Neo4jOgmEntityInstantiatorAdapter.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/Neo4jOgmEntityInstantiatorAdapter.java
index dd5744d8e..75f3749ec 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/Neo4jOgmEntityInstantiatorAdapter.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/Neo4jOgmEntityInstantiatorAdapter.java
@@ -21,9 +21,9 @@ import java.util.Map;
 
 import org.neo4j.ogm.metadata.reflect.EntityAccessManager;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.data.convert.EntityInstantiator;
 import org.springframework.data.mapping.PreferredConstructor;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.model.EntityInstantiator;
 import org.springframework.data.mapping.model.ParameterValueProvider;
 import org.springframework.data.neo4j.mapping.Neo4jMappingContext;
 import org.springframework.data.neo4j.mapping.Neo4jPersistentEntity;
diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jMappingContext.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jMappingContext.java
index b70f2af99..b7b6bfa30 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jMappingContext.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jMappingContext.java
@@ -37,11 +37,11 @@ import org.neo4j.ogm.types.spatial.CartesianPoint2d;
 import org.neo4j.ogm.types.spatial.GeographicPoint2d;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.convert.EntityInstantiator;
-import org.springframework.data.convert.EntityInstantiators;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.AbstractMappingContext;
+import org.springframework.data.mapping.model.EntityInstantiator;
+import org.springframework.data.mapping.model.EntityInstantiators;
 import org.springframework.data.mapping.model.Property;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.util.TypeInformation;
@@ -156,7 +156,12 @@ public class Neo4jMappingContext extends AbstractMappingContext<Neo4jPersistentE
 				updateSimpleTypeHolder(simpleTypeHolder, propertyField));
 	}
 
-	public EntityInstantiator getInstantiatorFor(PersistentEntity<?, ?> entity) {
+	/**
+	 * This is not public API and should not be overwritten.
+	 * @param entity The persistent entity for which to retrieve an {@link EntityInstantiator}.
+	 * @return An instantiator for a given entity.
+	 */
+	public final EntityInstantiator getInstantiatorFor(PersistentEntity<?, ?> entity) {
 		return instantiators.getInstantiatorFor(entity);
 	}