From 7dfa3a8c8398db26a7bb22abc237b173a9e158aa Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 26 Sep 2016 10:47:09 +0200
Subject: [PATCH] Harmonize Caffeine CacheManager bean name

Closes gh-6980
---
 .../boot/autoconfigure/cache/CaffeineCacheConfiguration.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java
index 8ab62b4567..04d6456def 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CaffeineCacheConfiguration.java
@@ -68,7 +68,7 @@ class CaffeineCacheConfiguration {
 	}
 
 	@Bean
-	public CaffeineCacheManager caffeineCacheManager() {
+	public CaffeineCacheManager cacheManager() {
 		CaffeineCacheManager cacheManager = createCacheManager();
 		List<String> cacheNames = this.cacheProperties.getCacheNames();
 		if (!CollectionUtils.isEmpty(cacheNames)) {