diff --git a/initializr-docs/src/main/asciidoc/configuration-guide.adoc b/initializr-docs/src/main/asciidoc/configuration-guide.adoc
index 6eb27f4f..778d2106 100644
--- a/initializr-docs/src/main/asciidoc/configuration-guide.adoc
+++ b/initializr-docs/src/main/asciidoc/configuration-guide.adoc
@@ -789,14 +789,15 @@ one will require some configuration to get it working):
 |===
 | cache name | Description
 
-|`initializr`
+|`initializr.metadata`
 |Cache the full metadata of the service. When the metadata expires, it is fully resolved
 again (including a check on spring.io for the latest Spring Boot versions). Adapt the
 expiration settings accordingly.
 
-|`project-resources`
+|`initializr.dependency-metadata`
+|Cache dependency-specific metadata.
+
+|`initializr.project-resources`
 |Cache resources that are used to generate projects.
 
-|`dependency-metadata`
-|Cache dependency-specific metadata.
 |===
diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectResourceLocator.java b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectResourceLocator.java
index f3fd6b0b..51752d65 100644
--- a/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectResourceLocator.java
+++ b/initializr-generator/src/main/java/io/spring/initializr/generator/ProjectResourceLocator.java
@@ -39,7 +39,7 @@ public class ProjectResourceLocator {
 	 * @param location a resource location
 	 * @return the content of the resource
 	 */
-	@Cacheable("project-resources")
+	@Cacheable("initializr.project-resources")
 	public byte[] getBinaryResource(String location) {
 		try (InputStream stream = getInputStream(location)) {
 			return StreamUtils.copyToByteArray(stream);
@@ -54,7 +54,7 @@ public class ProjectResourceLocator {
 	 * @param location a resource location
 	 * @return the content of the resource
 	 */
-	@Cacheable("project-resources")
+	@Cacheable("initializr.project-resources")
 	public String getTextResource(String location) {
 		try (InputStream stream = getInputStream(location)) {
 			return StreamUtils.copyToString(stream, UTF_8);
diff --git a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java
index 86a53a00..73d7b220 100644
--- a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java
+++ b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java
@@ -161,10 +161,10 @@ public class InitializrAutoConfiguration {
 		@Bean
 		public JCacheManagerCustomizer initializrCacheManagerCustomizer() {
 			return cm -> {
-				cm.createCache("initializr", config().setExpiryPolicyFactory(
+				cm.createCache("initializr.metadata", config().setExpiryPolicyFactory(
 						CreatedExpiryPolicy.factoryOf(Duration.TEN_MINUTES)));
-				cm.createCache("dependency-metadata", config());
-				cm.createCache("project-resources", config());
+				cm.createCache("initializr.dependency-metadata", config());
+				cm.createCache("initializr.project-resources", config());
 			};
 		}
 
diff --git a/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java b/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java
index 26a16677..05af0aff 100644
--- a/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java
+++ b/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java
@@ -37,7 +37,7 @@ import org.springframework.cache.annotation.Cacheable;
 public class DefaultDependencyMetadataProvider implements DependencyMetadataProvider {
 
 	@Override
-	@Cacheable(cacheNames = "dependency-metadata", key = "#p1")
+	@Cacheable(cacheNames = "initializr.dependency-metadata", key = "#p1")
 	public DependencyMetadata get(InitializrMetadata metadata, Version bootVersion) {
 		Map<String, Dependency> dependencies = new LinkedHashMap<>();
 		for (Dependency d : metadata.getDependencies().getAll()) {
diff --git a/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultInitializrMetadataProvider.java b/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultInitializrMetadataProvider.java
index 3ac8bc59..63b33c69 100644
--- a/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultInitializrMetadataProvider.java
+++ b/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultInitializrMetadataProvider.java
@@ -49,7 +49,7 @@ public class DefaultInitializrMetadataProvider implements InitializrMetadataProv
 	}
 
 	@Override
-	@Cacheable(value = "initializr", key = "'metadata'")
+	@Cacheable(value = "initializr.metadata", key = "'metadata'")
 	public InitializrMetadata get() {
 		updateInitializrMetadata(metadata);
 		return metadata;