diff --git a/spring-native-configuration/src/main/java/org/springframework/cache/annotation/CachingHints.java b/spring-native-configuration/src/main/java/org/springframework/cache/annotation/CachingHints.java
index 9db02806a..eb3d129c5 100644
--- a/spring-native-configuration/src/main/java/org/springframework/cache/annotation/CachingHints.java
+++ b/spring-native-configuration/src/main/java/org/springframework/cache/annotation/CachingHints.java
@@ -16,15 +16,18 @@
 package org.springframework.cache.annotation;
 
 import org.springframework.context.annotation.AutoProxyRegistrar;
+import org.springframework.nativex.extension.InitializationInfo;
+import org.springframework.nativex.extension.InitializationTime;
 import org.springframework.nativex.extension.NativeConfiguration;
 import org.springframework.nativex.extension.NativeHint;
 import org.springframework.nativex.extension.TypeInfo;
+import org.springframework.nativex.type.AccessBits;
 
-@NativeHint(trigger=CachingConfigurationSelector.class, typeInfos = {
-		@TypeInfo(types= {AutoProxyRegistrar.class,ProxyCachingConfiguration.class},typeNames= {
+@NativeHint(trigger = CachingConfigurationSelector.class, typeInfos =
+		@TypeInfo(types = { AutoProxyRegistrar.class, ProxyCachingConfiguration.class }, typeNames= {
 				"org.springframework.cache.jcache.config.ProxyJCacheConfiguration",
 				"org.springframework.cache.aspectj.AspectJCachingConfiguration",
 				"org.springframework.cache.aspectj.AspectJJCacheConfiguration"
-
-		})})
+		}, access = AccessBits.CONFIGURATION))
+@NativeHint(initializationInfos = @InitializationInfo(types = CachingConfigurationSelector.class, initTime = InitializationTime.BUILD))
 public class CachingHints implements NativeConfiguration { }
\ No newline at end of file
diff --git a/spring-native-docs/src/main/asciidoc/support.adoc b/spring-native-docs/src/main/asciidoc/support.adoc
index ad54cd63a..7eb6f4880 100644
--- a/spring-native-docs/src/main/asciidoc/support.adoc
+++ b/spring-native-docs/src/main/asciidoc/support.adoc
@@ -18,7 +18,6 @@ The following starters are supported, the group ID is `org.springframework.boot`
 
 * `spring-boot-starter-actuator`: WebMvc and WebFlux are supported, as well as metrics and tracing infrastructure. Beware that actuators significantly increase the footprint, this will be optimized in a future release.
 ** `--enable-https` flag is required for HTTPS support.
-* `spring-boot-starter-cache`
 * `spring-boot-starter-data-elasticsearch`
 ** `--enable-https` flag is required for HTTPS support.
 * `spring-boot-starter-data-jdbc`
diff --git a/spring-native-samples/petclinic-jpa/pom.xml b/spring-native-samples/petclinic-jpa/pom.xml
index 2822630a6..f212922fa 100644
--- a/spring-native-samples/petclinic-jpa/pom.xml
+++ b/spring-native-samples/petclinic-jpa/pom.xml
@@ -44,10 +44,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-context-indexer</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -112,16 +108,6 @@
             <scope>test</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/spring-native-samples/petclinic-jpa/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/spring-native-samples/petclinic-jpa/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java
index e16fbea03..b7a66ca22 100644
--- a/spring-native-samples/petclinic-jpa/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java
+++ b/spring-native-samples/petclinic-jpa/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java
@@ -19,12 +19,12 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration;
+import org.springframework.cache.annotation.EnableCaching;
 
 /**
  * PetClinic Spring Boot Application.
  *
  * @author Dave Syer
- *
  */
 @SpringBootApplication
 public class PetClinicApplication {
diff --git a/spring-native-samples/petclinic-jpa/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java b/spring-native-samples/petclinic-jpa/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
index 549b1c229..e1d6ab086 100644
--- a/spring-native-samples/petclinic-jpa/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
+++ b/spring-native-samples/petclinic-jpa/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
@@ -17,7 +17,6 @@
 
 import java.util.Collection;
 
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.repository.Repository;
 import org.springframework.transaction.annotation.Transactional;
@@ -40,7 +39,6 @@ public interface VetRepository extends Repository<Vet, Integer> {
 	 * @return a <code>Collection</code> of <code>Vet</code>s
 	 */
 	@Transactional(readOnly = true)
-	@Cacheable("vets")
 	Collection<Vet> findAll() throws DataAccessException;
 
 }