diff --git a/pom.xml b/pom.xml
index 82f7f4e7..da87b9f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,16 +22,16 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<assertj-core.version>3.12.0</assertj-core.version>
+		<assertj-core.version>3.13.2</assertj-core.version>
 		<json-path.version>2.4.0</json-path.version>
 		<junit.version>5.5.0</junit.version>
 		<kotlin.version>1.3.40</kotlin.version>
 		<mockk.version>1.9.3</mockk.version>
 		<mockito-core.version>3.0.0</mockito-core.version>
-		<spring.version>5.2.0.M3</spring.version>
-		<spring-data-releasetrain.version>Moore-M4</spring-data-releasetrain.version>
+		<spring.version>5.2.0.RC1</spring.version>
+		<spring-data-releasetrain.version>Moore-RC2</spring-data-releasetrain.version>
 		<spring-security-bom.version>5.1.5.RELEASE</spring-security-bom.version>
-		<reactor.version>Dysprosium-M1</reactor.version>
+		<reactor.version>Dysprosium-M3</reactor.version>
 		<java.version>1.8</java.version>
 		<project.type>multi</project.type>
 		<dist.id>spring-vault</dist.id>
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntity.java b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntity.java
index 37b19e5c..b6268956 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntity.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntity.java
@@ -31,18 +31,15 @@ import org.springframework.util.StringUtils;
  * @author Mark Paluch
  * @since 2.0
  */
-public class BasicVaultPersistentEntity<T> extends
-		BasicKeyValuePersistentEntity<T, VaultPersistentProperty> implements
-		VaultPersistentEntity<T> {
+public class BasicVaultPersistentEntity<T>
+		extends BasicKeyValuePersistentEntity<T, VaultPersistentProperty>
+		implements VaultPersistentEntity<T> {
 
 	private static final SpelExpressionParser PARSER = new SpelExpressionParser();
 
-	private final @Nullable String backend;
+	private final String backend;
 	private final @Nullable Expression backendExpression;
 
-	private final @Nullable String keyspace;
-	private final @Nullable Expression keyspaceExpression;
-
 	/**
 	 * Creates new {@link BasicVaultPersistentEntity}.
 	 *
@@ -60,15 +57,10 @@ public class BasicVaultPersistentEntity<T> extends
 			this.backend = annotation.backend();
 			this.backendExpression = detectExpression(this.backend);
 
-			this.keyspace = super.getKeySpace();
-			this.keyspaceExpression = detectExpression(this.keyspace);
 		}
 		else {
 			this.backend = "secret";
 			this.backendExpression = null;
-
-			this.keyspace = super.getKeySpace();
-			this.keyspaceExpression = null;
 		}
 	}
 
@@ -90,20 +82,14 @@ public class BasicVaultPersistentEntity<T> extends
 
 	@Override
 	public String getKeySpace() {
-		return String.format("%s/%s", getSecretBackend(), doGetKeySpace());
-	}
-
-	private String doGetKeySpace() {
-		return keyspaceExpression == null //
-		? keyspace //
-				: keyspaceExpression.getValue(getEvaluationContext(null), String.class);
+		return String.format("%s/%s", getSecretBackend(), super.getKeySpace());
 	}
 
 	@Override
 	public String getSecretBackend() {
 
 		return backendExpression == null //
-		? backend //
+				? backend //
 				: backendExpression.getValue(getEvaluationContext(null), String.class);
 	}
 }
diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml
index be6a5f2b..8a1aba94 100644
--- a/spring-vault-dependencies/pom.xml
+++ b/spring-vault-dependencies/pom.xml
@@ -57,15 +57,15 @@
 	</licenses>
 
 	<properties>
-		<httpclient.version>4.5.7</httpclient.version>
+		<httpclient.version>4.5.9</httpclient.version>
 		<httpcore.version>4.4.11</httpcore.version>
 		<jetty-client.version>1.0.3</jetty-client.version>
-		<netty.version>4.1.36.Final</netty.version>
+		<netty.version>4.1.38.Final</netty.version>
 		<okhttp3.version>3.14.2</okhttp3.version>
-		<jackson.version>2.9.9</jackson.version>
-		<aws-java-sdk.version>1.11.507</aws-java-sdk.version>
-		<google-api-services-iam.version>v1-rev259-1.25.0</google-api-services-iam.version>
-		<google-auth-library-oauth2-http.version>0.10.0</google-auth-library-oauth2-http.version>
+		<jackson-databind.version>2.9.9.3</jackson-databind.version>
+		<aws-java-sdk.version>1.11.605</aws-java-sdk.version>
+		<google-api-services-iam.version>v1-rev20190704-1.30.1</google-api-services-iam.version>
+		<google-auth-library-oauth2-http.version>0.16.2</google-auth-library-oauth2-http.version>
 	</properties>
 
 	<dependencyManagement>
@@ -82,7 +82,7 @@
 			<dependency>
 				<groupId>com.fasterxml.jackson.core</groupId>
 				<artifactId>jackson-databind</artifactId>
-				<version>${jackson.version}</version>
+				<version>${jackson-databind.version}</version>
 			</dependency>
 
 			<!-- HTTP Client Libraries -->