diff --git a/src/main/java/org/springframework/data/util/ClassTypeInformation.java b/src/main/java/org/springframework/data/util/ClassTypeInformation.java
index a5b160455..7ae71d7b8 100644
--- a/src/main/java/org/springframework/data/util/ClassTypeInformation.java
+++ b/src/main/java/org/springframework/data/util/ClassTypeInformation.java
@@ -92,7 +92,8 @@ public class ClassTypeInformation<S> extends TypeDiscoverer<S> {
 	public static <S> TypeInformation<S> fromReturnTypeOf(Method method) {
 
 		Assert.notNull(method, "Method must not be null!");
-		return new ClassTypeInformation(method.getDeclaringClass()).createInfo(method.getGenericReturnType());
+		return (TypeInformation<S>) ClassTypeInformation.from(method.getDeclaringClass())
+				.createInfo(method.getGenericReturnType());
 	}
 
 	/**
diff --git a/src/main/java/org/springframework/data/util/TypeDiscoverer.java b/src/main/java/org/springframework/data/util/TypeDiscoverer.java
index a7050ff60..f26863075 100644
--- a/src/main/java/org/springframework/data/util/TypeDiscoverer.java
+++ b/src/main/java/org/springframework/data/util/TypeDiscoverer.java
@@ -103,7 +103,7 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
 		}
 
 		if (fieldType instanceof Class) {
-			return new ClassTypeInformation((Class<?>) fieldType);
+			return ClassTypeInformation.from((Class<?>) fieldType);
 		}
 
 		Class<S> resolveType = resolveType(fieldType);