diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
index 894439c0a3..fa0b7d866a 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertyName.java
@@ -444,6 +444,7 @@ public final class ConfigurationPropertyName implements Comparable<Configuration
 				}
 				hashCode = 31 * hashCode + elementHashCode;
 			}
+			this.hashCode = hashCode;
 		}
 		return hashCode;
 	}
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyNameTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyNameTests.java
index 44aec7c704..9887a67bcc 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyNameTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/source/ConfigurationPropertyNameTests.java
@@ -619,4 +619,11 @@ class ConfigurationPropertyNameTests {
 		assertThat(ConfigurationPropertyName.isValid("foo!bar")).isFalse();
 	}
 
+	@Test
+	void hashCodeIsStored() {
+		ConfigurationPropertyName name = ConfigurationPropertyName.of("hash.code");
+		int hashCode = name.hashCode();
+		assertThat(name).hasFieldOrPropertyWithValue("hashCode", hashCode);
+	}
+
 }