diff --git a/configuration/configuration/src/main/java/org/eclipse/store/configuration/types/ConfigurationBasedCreator.java b/configuration/configuration/src/main/java/org/eclipse/store/configuration/types/ConfigurationBasedCreator.java
index a65abc42..c70dc419 100644
--- a/configuration/configuration/src/main/java/org/eclipse/store/configuration/types/ConfigurationBasedCreator.java
+++ b/configuration/configuration/src/main/java/org/eclipse/store/configuration/types/ConfigurationBasedCreator.java
@@ -34,6 +34,7 @@ public interface ConfigurationBasedCreator<T>
 	public T create(Configuration configuration);
 	
 	
+	@SuppressWarnings("unchecked") // type-safety ensured by logic
 	public static <T> List<ConfigurationBasedCreator<T>> registeredCreators(
 		final Class<T> resultType
 	)
@@ -43,8 +44,8 @@ public static <T> List<ConfigurationBasedCreator<T>> registeredCreators(
 			false
 		)
 		.filter(creator -> resultType.isAssignableFrom(creator.resultType()))
-		.collect(Collectors.toList())
-		;
+		.map(c -> (ConfigurationBasedCreator<T>)c)
+		.collect(Collectors.toList());
 	}