diff --git a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
index 7a26ff261..0d160f10c 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/JpaRepositoryFactory.java
@@ -97,12 +97,12 @@ public class JpaRepositoryFactory extends RepositoryFactorySupport {
      * @param em
      * @return
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     protected EntityMetadata<?> createEntityInformation(Class<?> domainClass,
             EntityManager em) {
 
         if (Persistable.class.isAssignableFrom(domainClass)) {
-            return new PersistableEntityMetadata();
+            return new PersistableEntityMetadata(domainClass);
         } else {
             return new JpaMetamodelEntityMetadata(domainClass,
                     em.getMetamodel());