diff --git a/gradle.properties b/gradle.properties
index 77d723a1..109512fe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,7 +24,7 @@ jedisVersion=2.8.1
 h2Version=1.4.192
 springDataMongoVersion=1.9.4.RELEASE
 springShellVersion=1.1.0.RELEASE
-springDataGemFireVersion=1.8.4.RELEASE
+springDataGemFireVersion=1.8.5.RELEASE
 assertjVersion=2.5.0
 spockVersion=1.0-groovy-2.4
 webjarsTaglibVersion=0.3
diff --git a/samples/httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/spring/session-client.xml b/samples/httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/spring/session-client.xml
index 95991814..96e76e18 100644
--- a/samples/httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/spring/session-client.xml
+++ b/samples/httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/spring/session-client.xml
@@ -28,7 +28,7 @@
 	</util:properties>
 
 	<!--5-->
-	<gfe:client-cache properties-ref="gemfireProperties"/>
+	<gfe:client-cache properties-ref="gemfireProperties" pool-name="gemfirePool"/>
 
 	<!--6-->
 	<gfe:pool keep-alive="false"
@@ -43,7 +43,7 @@
 
 	<!--7-->
 	<bean class="org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration"
-		  p:maxInactiveIntervalInSeconds="30"/>
+		  p:maxInactiveIntervalInSeconds="30" p:poolName="DEFAULT"/>
 	<!-- end::beans[] -->
 
 </beans>
diff --git a/samples/httpsession-gemfire-clientserver/src/main/java/sample/ClientConfig.java b/samples/httpsession-gemfire-clientserver/src/main/java/sample/ClientConfig.java
index 2e857650..6cfbeacd 100644
--- a/samples/httpsession-gemfire-clientserver/src/main/java/sample/ClientConfig.java
+++ b/samples/httpsession-gemfire-clientserver/src/main/java/sample/ClientConfig.java
@@ -32,13 +32,12 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
-import org.springframework.data.gemfire.client.PoolFactoryBean;
 import org.springframework.data.gemfire.support.ConnectionEndpoint;
 import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession;
 import org.springframework.util.Assert;
 
 // tag::class[]
-@EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 30) // <1>
+@EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 30, poolName = "DEFAULT") // <1>
 public class ClientConfig {
 
 	static final long DEFAULT_WAIT_DURATION = TimeUnit.SECONDS.toMillis(20);
@@ -70,32 +69,26 @@ public class ClientConfig {
 	}
 
 	@Bean
-	ClientCacheFactoryBean gemfireCache() { // <3>
+	ClientCacheFactoryBean gemfireCache(
+			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT + "}") int port) { // <3>
+
 		ClientCacheFactoryBean clientCacheFactory = new ClientCacheFactoryBean();
 
 		clientCacheFactory.setClose(true);
 		clientCacheFactory.setProperties(gemfireProperties());
 
-		return clientCacheFactory;
-	}
+		// GemFire Pool settings <4>
+		clientCacheFactory.setKeepAlive(false);
+		clientCacheFactory.setPingInterval(TimeUnit.SECONDS.toMillis(5));
+		clientCacheFactory.setReadTimeout(2000); // 2 seconds
+		clientCacheFactory.setRetryAttempts(1);
+		clientCacheFactory.setSubscriptionEnabled(true);
+		clientCacheFactory.setThreadLocalConnections(false);
 
-	@Bean
-	PoolFactoryBean gemfirePool(// <4>
-			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT + "}") int port) {
-
-		PoolFactoryBean poolFactory = new PoolFactoryBean();
-
-		poolFactory.setKeepAlive(false);
-		poolFactory.setPingInterval(TimeUnit.SECONDS.toMillis(5));
-		poolFactory.setReadTimeout(2000); // 2 seconds
-		poolFactory.setRetryAttempts(1);
-		poolFactory.setSubscriptionEnabled(true);
-		poolFactory.setThreadLocalConnections(false);
-
-		poolFactory.setServers(Collections.singletonList(
+		clientCacheFactory.setServers(Collections.singletonList(
 			newConnectionEndpoint(ServerConfig.SERVER_HOST, port)));
 
-		return poolFactory;
+		return clientCacheFactory;
 	}
 
 	ConnectionEndpoint newConnectionEndpoint(String host, int port) {
diff --git a/samples/httpsession-gemfire-clientserver/src/main/java/sample/ServerConfig.java b/samples/httpsession-gemfire-clientserver/src/main/java/sample/ServerConfig.java
index d1a86e46..28f7115f 100644
--- a/samples/httpsession-gemfire-clientserver/src/main/java/sample/ServerConfig.java
+++ b/samples/httpsession-gemfire-clientserver/src/main/java/sample/ServerConfig.java
@@ -50,7 +50,6 @@ public class ServerConfig {
 		return new PropertySourcesPlaceholderConfigurer();
 	}
 
-	@Bean
 	Properties gemfireProperties() { // <2>
 		Properties gemfireProperties = new Properties();