diff --git a/pom.xml b/pom.xml
index d91df5d9..038ce7a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 		<junit.version>4.12</junit.version>
 		<mockito-core.version>2.23.4</mockito-core.version>
 		<spring.version>5.2.0.M2</spring.version>
-		<spring-data-releasetrain.version>Lovelace-SR5</spring-data-releasetrain.version>
+		<spring-data-releasetrain.version>Moore-M4</spring-data-releasetrain.version>
 		<spring-security-bom.version>5.1.4.RELEASE</spring-security-bom.version>
 		<reactor.version>Dysprosium-M1</reactor.version>
 		<java.version>1.8</java.version>
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoryConfigurationExtension.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoryConfigurationExtension.java
index 1bd3decb..d017c990 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoryConfigurationExtension.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/configuration/VaultRepositoryConfigurationExtension.java
@@ -71,7 +71,7 @@ public class VaultRepositoryConfigurationExtension extends
 		RootBeanDefinition mappingContextDefinition = createVaultMappingContext(configurationSource);
 		mappingContextDefinition.setSource(configurationSource.getSource());
 
-		registerIfNotAlreadyRegistered(mappingContextDefinition, registry,
+		registerIfNotAlreadyRegistered(() -> mappingContextDefinition, registry,
 				VAULT_MAPPING_CONTEXT_BEAN_NAME, configurationSource);
 
 		// register Adapter
@@ -86,7 +86,7 @@ public class VaultRepositoryConfigurationExtension extends
 		vaultKeyValueAdapterDefinition
 				.setConstructorArgumentValues(constructorArgumentValuesForVaultKeyValueAdapter);
 
-		registerIfNotAlreadyRegistered(vaultKeyValueAdapterDefinition, registry,
+		registerIfNotAlreadyRegistered(() -> vaultKeyValueAdapterDefinition, registry,
 				VAULT_ADAPTER_BEAN_NAME, configurationSource);
 
 		Optional<String> keyValueTemplateName = configurationSource
@@ -97,10 +97,9 @@ public class VaultRepositoryConfigurationExtension extends
 				&& getDefaultKeyValueTemplateRef().equals(keyValueTemplateName.get())
 				&& !registry.containsBeanDefinition(keyValueTemplateName.get())) {
 
-			AbstractBeanDefinition beanDefinition = getDefaultKeyValueTemplateBeanDefinition(configurationSource);
-
-			registerIfNotAlreadyRegistered(beanDefinition, registry,
-					keyValueTemplateName.get(), configurationSource.getSource());
+			registerIfNotAlreadyRegistered(
+					() -> getDefaultKeyValueTemplateBeanDefinition(configurationSource),
+					registry, keyValueTemplateName.get(), configurationSource.getSource());
 		}
 
 		super.registerBeansForRoot(registry, configurationSource);