diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentEntity.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentEntity.java
index e216ee4865..77d10a7c11 100644
--- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentEntity.java
+++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentEntity.java
@@ -37,6 +37,7 @@
  * @author Bastian Wilhelm
  * @author Mikhail Polivakha
  * @author Kurt Niemi
+ * @author Sergey Korotaev
  */
 class BasicRelationalPersistentEntity<T> extends BasicPersistentEntity<T, RelationalPersistentProperty>
 		implements RelationalPersistentEntity<T> {
@@ -44,9 +45,9 @@ class BasicRelationalPersistentEntity<T> extends BasicPersistentEntity<T, Relati
 	private static final SpelExpressionParser PARSER = new SpelExpressionParser();
 
 	private final Lazy<SqlIdentifier> tableName;
-	private final @Nullable Expression tableNameExpression;
+	private final Lazy<SqlIdentifier> tableNameExpression;
 	private final Lazy<Optional<SqlIdentifier>> schemaName;
-	private final @Nullable Expression schemaNameExpression;
+	private final Lazy<SqlIdentifier> schemaNameExpression;
 	private final ExpressionEvaluator expressionEvaluator;
 	private boolean forceQuote = true;
 
@@ -72,19 +73,19 @@ class BasicRelationalPersistentEntity<T> extends BasicPersistentEntity<T, Relati
 
 			this.tableName = Lazy.of(() -> StringUtils.hasText(table.value()) ? createSqlIdentifier(table.value())
 					: createDerivedSqlIdentifier(namingStrategy.getTableName(getType())));
-			this.tableNameExpression = detectExpression(table.value());
+			this.tableNameExpression = Lazy.of(() -> detectExpression(table.value()));
 
 			this.schemaName = StringUtils.hasText(table.schema())
 					? Lazy.of(() -> Optional.of(createSqlIdentifier(table.schema())))
 					: defaultSchema;
-			this.schemaNameExpression = detectExpression(table.schema());
+			this.schemaNameExpression = Lazy.of(() -> detectExpression(table.schema()));
 
 		} else {
 
 			this.tableName = Lazy.of(() -> createDerivedSqlIdentifier(namingStrategy.getTableName(getType())));
-			this.tableNameExpression = null;
+			this.tableNameExpression = Lazy.empty();
 			this.schemaName = defaultSchema;
-			this.schemaNameExpression = null;
+			this.schemaNameExpression = Lazy.empty();
 		}
 	}
 
@@ -93,17 +94,20 @@ class BasicRelationalPersistentEntity<T> extends BasicPersistentEntity<T, Relati
 	 * {@link LiteralExpression} (indicating that no subsequent evaluation is necessary).
 	 *
 	 * @param potentialExpression can be {@literal null}
-	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	private static Expression detectExpression(@Nullable String potentialExpression) {
+	private SqlIdentifier detectExpression(@Nullable String potentialExpression) {
+
 
 		if (!StringUtils.hasText(potentialExpression)) {
 			return null;
 		}
 
 		Expression expression = PARSER.parseExpression(potentialExpression, ParserContext.TEMPLATE_EXPRESSION);
-		return expression instanceof LiteralExpression ? null : expression;
+		if (expression instanceof LiteralExpression) {
+			return null;
+		}
+
+		return createSqlIdentifier(expressionEvaluator.evaluate(expression));
 	}
 
 	private SqlIdentifier createSqlIdentifier(String name) {
@@ -124,32 +128,21 @@ public void setForceQuote(boolean forceQuote) {
 
 	@Override
 	public SqlIdentifier getTableName() {
-
-		if (tableNameExpression == null) {
-			return tableName.get();
-		}
-
-		return createSqlIdentifier(expressionEvaluator.evaluate(tableNameExpression));
+		return tableNameExpression.getOptional()
+				.orElse(tableName.get());
 	}
 
 	@Override
 	public SqlIdentifier getQualifiedTableName() {
 
 		SqlIdentifier schema;
-		if (schemaNameExpression != null) {
-			schema = createSqlIdentifier(expressionEvaluator.evaluate(schemaNameExpression));
-		} else {
-			schema = schemaName.get().orElse(null);
-		}
+		schema = schemaNameExpression.getOptional()
+				.orElse(schemaName.get().orElse(null));
 
 		if (schema == null) {
 			return getTableName();
 		}
 
-		if (schemaNameExpression != null) {
-			schema = createSqlIdentifier(expressionEvaluator.evaluate(schemaNameExpression));
-		}
-
 		return SqlIdentifier.from(schema, getTableName());
 	}
 
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java
index 395174a645..0656b91974 100644
--- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java
+++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/mapping/BasicRelationalPersistentProperty.java
@@ -43,6 +43,7 @@
  * @author Florian Lüdiger
  * @author Bastian Wilhelm
  * @author Kurt Niemi
+ * @author Sergey Korotaev
  */
 public class BasicRelationalPersistentProperty extends AnnotationBasedPersistentProperty<RelationalPersistentProperty>
 		implements RelationalPersistentProperty {
@@ -51,11 +52,11 @@ public class BasicRelationalPersistentProperty extends AnnotationBasedPersistent
 
 	private final Lazy<SqlIdentifier> columnName;
 	private final boolean hasExplicitColumnName;
-	private final @Nullable Expression columnNameExpression;
+	private final Lazy<SqlIdentifier> columnNameExpression;
 	private final SqlIdentifier sequence;
 	private final Lazy<Optional<SqlIdentifier>> collectionIdColumnName;
 	private final Lazy<SqlIdentifier> collectionKeyColumnName;
-	private final @Nullable Expression collectionKeyColumnNameExpression;
+	private final Lazy<SqlIdentifier> collectionKeyColumnNameExpression;
 	private final boolean isEmbedded;
 	private final String embeddedPrefix;
 
@@ -101,10 +102,10 @@ public BasicRelationalPersistentProperty(Property property, PersistentEntity<?,
 					() -> StringUtils.hasText(mappedCollection.keyColumn()) ? createSqlIdentifier(mappedCollection.keyColumn())
 							: createDerivedSqlIdentifier(namingStrategy.getKeyColumn(this)));
 
-			this.collectionKeyColumnNameExpression = detectExpression(mappedCollection.keyColumn());
+			this.collectionKeyColumnNameExpression = Lazy.of(() -> detectExpression(mappedCollection.keyColumn()));
 		} else {
 
-			this.collectionKeyColumnNameExpression = null;
+			this.collectionKeyColumnNameExpression = Lazy.empty();
 		}
 
 		if (isAnnotationPresent(Column.class)) {
@@ -114,7 +115,7 @@ public BasicRelationalPersistentProperty(Property property, PersistentEntity<?,
 
 			this.columnName = Lazy.of(() -> StringUtils.hasText(column.value()) ? createSqlIdentifier(column.value())
 					: createDerivedSqlIdentifier(namingStrategy.getColumnName(this)));
-			this.columnNameExpression = detectExpression(column.value());
+			this.columnNameExpression = Lazy.of(() -> detectExpression(column.value()));
 
 			if (collectionIdColumnName == null && StringUtils.hasText(column.value())) {
 				collectionIdColumnName = Lazy.of(() -> Optional.of(createSqlIdentifier(column.value())));
@@ -123,7 +124,7 @@ public BasicRelationalPersistentProperty(Property property, PersistentEntity<?,
 		} else {
 			this.hasExplicitColumnName = false;
 			this.columnName = Lazy.of(() -> createDerivedSqlIdentifier(namingStrategy.getColumnName(this)));
-			this.columnNameExpression = null;
+			this.columnNameExpression = Lazy.empty();
 		}
 
 		this.sequence = determineSequenceName();
@@ -145,17 +146,19 @@ void setExpressionEvaluator(ExpressionEvaluator expressionEvaluator) {
 	 * {@link LiteralExpression} (indicating that no subsequent evaluation is necessary).
 	 *
 	 * @param potentialExpression can be {@literal null}
-	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	private static Expression detectExpression(@Nullable String potentialExpression) {
+	private SqlIdentifier detectExpression(@Nullable String potentialExpression) {
 
 		if (!StringUtils.hasText(potentialExpression)) {
 			return null;
 		}
 
 		Expression expression = PARSER.parseExpression(potentialExpression, ParserContext.TEMPLATE_EXPRESSION);
-		return expression instanceof LiteralExpression ? null : expression;
+		if (expression instanceof LiteralExpression) {
+			return null;
+		}
+
+		return createSqlIdentifier(expressionEvaluator.evaluate(expression));
 	}
 
 	private SqlIdentifier createSqlIdentifier(String name) {
@@ -186,12 +189,8 @@ public boolean isEntity() {
 
 	@Override
 	public SqlIdentifier getColumnName() {
-
-		if (columnNameExpression == null) {
-			return columnName.get();
-		}
-
-		return createSqlIdentifier(expressionEvaluator.evaluate(columnNameExpression));
+		return columnNameExpression.getOptional()
+				.orElse(columnName.get());
 	}
 
 	@Override
@@ -218,11 +217,8 @@ public SqlIdentifier getKeyColumn() {
 			return null;
 		}
 
-		if (collectionKeyColumnNameExpression == null) {
-			return collectionKeyColumnName.get();
-		}
-
-		return createSqlIdentifier(expressionEvaluator.evaluate(collectionKeyColumnNameExpression));
+		return collectionKeyColumnNameExpression.getOptional()
+				.orElse(collectionKeyColumnName.get());
 	}
 
 	@Override