diff --git a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java
index cf0c5e3010f..e09f0bdebf3 100644
--- a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java
+++ b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java
@@ -25,7 +25,7 @@
  * @author Dave Syer
  *
  */
-@SpringBootApplication
+@SpringBootApplication(proxyBeanMethods = false)
 public class PetClinicApplication {
 
     public static void main(String[] args) {
diff --git a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java b/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
index 9d4a53c6480..4c083a41b96 100755
--- a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
+++ b/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
@@ -16,18 +16,19 @@
 
 package org.springframework.samples.petclinic.system;
 
+import javax.cache.configuration.MutableConfiguration;
+
 import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.cache.configuration.MutableConfiguration;
-
 /**
- * Cache configuration intended for caches providing the JCache API. This configuration creates the used cache for the
- * application and enables statistics that become accessible via JMX.
+ * Cache configuration intended for caches providing the JCache API. This configuration
+ * creates the used cache for the application and enables statistics that become
+ * accessible via JMX.
  */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @EnableCaching
 class CacheConfiguration {
 
@@ -39,11 +40,13 @@ public JCacheManagerCustomizer petclinicCacheConfigurationCustomizer() {
     }
 
     /**
-     * Create a simple configuration that enable statistics via the JCache programmatic configuration API.
+     * Create a simple configuration that enable statistics via the JCache programmatic
+     * configuration API.
      * <p>
-     * Within the configuration object that is provided by the JCache API standard, there is only a very limited set of
-     * configuration options. The really relevant configuration options (like the size limit) must be set via a
-     * configuration mechanism that is provided by the selected JCache implementation.
+     * Within the configuration object that is provided by the JCache API standard, there
+     * is only a very limited set of configuration options. The really relevant
+     * configuration options (like the size limit) must be set via a configuration
+     * mechanism that is provided by the selected JCache implementation.
      */
     private javax.cache.configuration.Configuration<Object, Object> cacheConfiguration() {
         return new MutableConfiguration<>().setStatisticsEnabled(true);