diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositorySupport.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositorySupport.java
index 1def33e85..93ebf69a9 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositorySupport.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositorySupport.java
@@ -33,7 +33,7 @@ public abstract class RepositorySupport<T, ID extends Serializable> implements
         Repository<T, ID> {
 
     private final Class<T> domainClass;
-    private final IsNewAware isNewStrategy;
+    private IsNewAware isNewStrategy;
 
 
     /**
@@ -45,8 +45,6 @@ public abstract class RepositorySupport<T, ID extends Serializable> implements
 
         Assert.notNull(domainClass);
         this.domainClass = domainClass;
-        this.isNewStrategy = createIsNewStrategy(domainClass);
-        Assert.notNull(isNewStrategy);
     }
 
 
@@ -81,6 +79,11 @@ public abstract class RepositorySupport<T, ID extends Serializable> implements
      */
     protected IsNewAware getIsNewStrategy() {
 
+        if (isNewStrategy == null) {
+            this.isNewStrategy = createIsNewStrategy(domainClass);
+            Assert.notNull(isNewStrategy);
+        }
+
         return isNewStrategy;
     }
 }