diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicDynamicMapPropertyMetadata.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicDynamicMapPropertyMetadata.java
index 476bc4ba8fe..bc503e0b9b6 100644
--- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicDynamicMapPropertyMetadata.java
+++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicDynamicMapPropertyMetadata.java
@@ -7,16 +7,16 @@
 package org.hibernate.search.mapper.orm.model.impl;
 
 class HibernateOrmBasicDynamicMapPropertyMetadata {
-	private final HibernateOrmGenericTypeModelFactory typeModelFactory;
+	private final HibernateOrmGenericTypeModelFactory<?> typeModelFactory;
 
-	HibernateOrmBasicDynamicMapPropertyMetadata(HibernateOrmGenericTypeModelFactory typeModelFactory) {
+	HibernateOrmBasicDynamicMapPropertyMetadata(HibernateOrmGenericTypeModelFactory<?> typeModelFactory) {
 		this.typeModelFactory = typeModelFactory;
 	}
 
 	/**
 	 * @return A factory of generic type models
 	 */
-	HibernateOrmGenericTypeModelFactory getTypeModelFactory() {
+	HibernateOrmGenericTypeModelFactory<?> getTypeModelFactory() {
 		return typeModelFactory;
 	}
 
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicTypeMetadataProvider.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicTypeMetadataProvider.java
index 47d8124d202..14dfc36c0fb 100644
--- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicTypeMetadataProvider.java
+++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmBasicTypeMetadataProvider.java
@@ -139,7 +139,7 @@ private static void collectDynamicMapProperty(Builder metadataProviderBuilder,
 			Map<String, HibernateOrmBasicDynamicMapPropertyMetadata> collectedProperties,
 			Property property) {
 		// This also recurses and collects embedded types
-		HibernateOrmGenericTypeModelFactory typeModelFactory =
+		HibernateOrmGenericTypeModelFactory<?> typeModelFactory =
 				collectValue( metadataProviderBuilder, property.getValue() );
 		collectedProperties.put(
 				property.getName(),
@@ -147,7 +147,7 @@ private static void collectDynamicMapProperty(Builder metadataProviderBuilder,
 		);
 	}
 
-	private static HibernateOrmGenericTypeModelFactory collectValue(Builder metadataProviderBuilder, Value value) {
+	private static HibernateOrmGenericTypeModelFactory<?> collectValue(Builder metadataProviderBuilder, Value value) {
 		if ( value instanceof Component ) {
 			return collectEmbedded( metadataProviderBuilder, (Component) value );
 		}
diff --git a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmDynamicMapPropertyModel.java b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmDynamicMapPropertyModel.java
index 82d1d23e8ca..3d612821412 100644
--- a/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmDynamicMapPropertyModel.java
+++ b/mapper/orm/src/main/java/org/hibernate/search/mapper/orm/model/impl/HibernateOrmDynamicMapPropertyModel.java
@@ -54,7 +54,7 @@ public Stream<Annotation> annotations() {
 	public PojoGenericTypeModel<T> typeModel() {
 		if ( typeModel == null ) {
 			try {
-				typeModel = ormPropertyMetadata.getTypeModelFactory().create( introspector );
+				typeModel = (PojoGenericTypeModel<T>) ormPropertyMetadata.getTypeModelFactory().create( introspector );
 			}
 			catch (RuntimeException e) {
 				throw log.errorRetrievingPropertyTypeModel( name(), holderTypeModel, e.getMessage(), e );