diff --git a/pom.xml b/pom.xml
index ca1a4c74b..d879eb929 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,16 @@
       <scope>runtime</scope>
     </dependency>
 
+    <!-- caching -->
+    <dependency>
+      <groupId>javax.cache</groupId>
+      <artifactId>cache-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+    </dependency>
+
     <!-- webjars -->
     <dependency>
       <groupId>org.webjars</groupId>
diff --git a/src/main/java/org/springframework/samples/petclinic/system/CacheConfig.java b/src/main/java/org/springframework/samples/petclinic/system/CacheConfig.java
index 8798bfb50..13e194c35 100755
--- a/src/main/java/org/springframework/samples/petclinic/system/CacheConfig.java
+++ b/src/main/java/org/springframework/samples/petclinic/system/CacheConfig.java
@@ -1,14 +1,32 @@
 package org.springframework.samples.petclinic.system;
 
+import javax.cache.configuration.Configuration;
+import javax.cache.configuration.MutableConfiguration;
+
+import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Profile;
 
 /**
- * Cache could be disable in unit test.
+ * Cache could be disabled in unit test.
  */
-@Configuration
+@org.springframework.context.annotation.Configuration
 @EnableCaching
 @Profile("production")
 class CacheConfig {
+
+    @Bean
+    public JCacheManagerCustomizer cacheManagerCustomizer() {
+        return cm -> {
+            Configuration<Object, Object> cacheConfiguration = createCacheConfiguration();
+            cm.createCache("vets", cacheConfiguration);
+        };
+    }
+
+    private Configuration<Object, Object> createCacheConfiguration() {
+        // Create a cache using infinite heap. A real application will want to use an
+        // implementation dependent configuration that will better fit your needs
+        return new MutableConfiguration<>().setStatisticsEnabled(true);
+    }
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index fb3e513c3..fb07c6c50 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -24,6 +24,3 @@ logging.level.org.springframework=INFO
 
 # Active Spring profiles
 spring.profiles.active=production
-
-# Caching
-spring.cache.cache-names=vets