diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/CachingProviderAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/CachingProviderAutoConfiguration.java
index 9e07b89d..ab5abac0 100644
--- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/CachingProviderAutoConfiguration.java
+++ b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/CachingProviderAutoConfiguration.java
@@ -54,13 +54,13 @@ import org.springframework.data.gemfire.cache.config.EnableGemfireCaching;
  * @since 1.0.0
  */
 @Configuration
+@AutoConfigureAfter(ClientCacheAutoConfiguration.class)
 @ConditionalOnBean(GemFireCache.class)
 @ConditionalOnClass({ GemfireCacheManager.class, GemFireCache.class })
 @ConditionalOnMissingBean(CacheManager.class)
-@AutoConfigureAfter(ClientCacheAutoConfiguration.class)
 @EnableGemfireCaching
 @SuppressWarnings("all")
-class CachingProviderAutoConfiguration {
+public class CachingProviderAutoConfiguration {
 
 	private final CacheManagerCustomizers cacheManagerCustomizers;
 
diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ClientSecurityAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ClientSecurityAutoConfiguration.java
index cfc5222b..ec1f5c78 100644
--- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ClientSecurityAutoConfiguration.java
+++ b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ClientSecurityAutoConfiguration.java
@@ -19,6 +19,7 @@ package org.springframework.boot.data.geode.autoconfigure;
 import java.util.Optional;
 import java.util.Properties;
 
+import org.apache.geode.cache.GemFireCache;
 import org.apache.geode.cache.client.ClientCache;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -26,6 +27,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.cloud.CloudPlatform;
 import org.springframework.boot.data.geode.core.env.VcapPropertySource;
@@ -47,12 +49,14 @@ import org.springframework.data.gemfire.config.annotation.support.AutoConfigured
  *
  * @author John Blum
  * @see java.util.Properties
+ * @see org.apache.geode.cache.GemFireCache
  * @see org.apache.geode.cache.client.ClientCache
  * @see org.springframework.boot.SpringApplication
  * @see org.springframework.boot.autoconfigure.EnableAutoConfiguration
  * @see org.springframework.boot.cloud.CloudPlatform
  * @see org.springframework.boot.data.geode.autoconfigure.ClientCacheAutoConfiguration
  * @see org.springframework.boot.data.geode.core.env.VcapPropertySource
+ * @see org.springframework.boot.data.geode.core.env.support.CloudCacheService
  * @see org.springframework.boot.env.EnvironmentPostProcessor
  * @see org.springframework.context.annotation.Configuration
  * @see org.springframework.core.env.Environment
@@ -65,6 +69,7 @@ import org.springframework.data.gemfire.config.annotation.support.AutoConfigured
 @AutoConfigureBefore(ClientCacheAutoConfiguration.class)
 @Conditional(ClientSecurityAutoConfiguration.EnableSecurityCondition.class)
 @ConditionalOnClass({ ClientCacheFactoryBean.class, ClientCache.class })
+@ConditionalOnMissingBean(GemFireCache.class)
 @EnableSecurity
 @SuppressWarnings("unused")
 public class ClientSecurityAutoConfiguration {
diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/FunctionExecutionAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/FunctionExecutionAutoConfiguration.java
index c757aad8..7320c6f4 100644
--- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/FunctionExecutionAutoConfiguration.java
+++ b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/FunctionExecutionAutoConfiguration.java
@@ -44,9 +44,9 @@ import org.springframework.data.gemfire.function.execution.GemfireFunctionOperat
  * @since 1.0.0
  */
 @Configuration
+@AutoConfigureAfter(ClientCacheAutoConfiguration.class)
 @ConditionalOnBean(GemFireCache.class)
 @ConditionalOnClass({ GemfireFunctionOperations.class, GemFireCache.class })
-@AutoConfigureAfter(ClientCacheAutoConfiguration.class)
 @EnableGemfireFunctions
 @Import(GemFireFunctionExecutionAutoConfigurationRegistrar.class)
 @SuppressWarnings("unused")
diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/RepositoriesAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/RepositoriesAutoConfiguration.java
index c68d34cb..50b5eb53 100644
--- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/RepositoriesAutoConfiguration.java
+++ b/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/RepositoriesAutoConfiguration.java
@@ -58,12 +58,12 @@ import org.springframework.data.gemfire.repository.support.GemfireRepositoryFact
  * @since 1.0.0
  */
 @Configuration
+@AutoConfigureAfter(ClientCacheAutoConfiguration.class)
 @ConditionalOnBean(GemFireCache.class)
 @ConditionalOnClass(GemfireRepository.class)
 @ConditionalOnMissingBean({ GemfireRepositoryConfigurationExtension.class, GemfireRepositoryFactoryBean.class })
 @ConditionalOnProperty(prefix = "spring.data.gemfire.repositories", name = "enabled", havingValue = "true",
 	matchIfMissing = true)
-@AutoConfigureAfter(ClientCacheAutoConfiguration.class)
 @Import(GemFireRepositoriesAutoConfigurationRegistrar.class)
 public class RepositoriesAutoConfiguration {