diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/common.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/common.xml
index 222ad520e2..8b07603df7 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/common.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/common.xml
@@ -4,16 +4,22 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="connectionFactory" class="org.springframework.jms.connection.SingleConnectionFactory">
+	<bean id="connectionFactory" class="org.springframework.jms.connection.CachingConnectionFactory">
 		<property name="targetConnectionFactory">
 			<bean class="org.apache.activemq.ActiveMQConnectionFactory">
 				<property name="brokerURL" value="vm://localhost"/>		
 			</bean>
 		</property>
+		<property name="sessionCacheSize" value="10"/>
+		<property name="cacheProducers" value="false"/>
 	</bean>
 
-	<bean id="demoQueue" class="org.apache.activemq.command.ActiveMQQueue">
+	<bean id="requestQueue" class="org.apache.activemq.command.ActiveMQQueue">
 		<constructor-arg value="queue.demo"/>
 	</bean>
 
+	<bean id="replyQueue" class="org.apache.activemq.command.ActiveMQQueue">
+		<constructor-arg value="queue.reply"/>
+	</bean>
+
 </beans>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
index 13bf9eeed6..e00ad285cb 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundChannelAdapter.xml
@@ -13,7 +13,7 @@
 			http://www.springframework.org/schema/integration/stream
 			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
-	<jms:inbound-channel-adapter id="jmsin" destination="demoQueue" channel="jmsinToStdoutChannel"/>
+	<jms:inbound-channel-adapter id="jmsin" destination="requestQueue" channel="jmsinToStdoutChannel"/>
 
 	<channel id="jmsinToStdoutChannel"/>
 
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
index 7d4b25f9e6..6ab683de81 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/inboundGateway.xml
@@ -17,7 +17,7 @@
 
 	<context:component-scan base-package="org.springframework.integration.samples.jms"/>
 
-	<jms:inbound-gateway id="jmsin" destination="demoQueue" request-channel="demoChannel"/>
+	<jms:inbound-gateway id="jmsin" destination="requestQueue" request-channel="demoChannel"/>
 
 	<channel id="demoChannel"/>
 
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml
index 0982a2a8c8..48511e7af0 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/outboundChannelAdapter.xml
@@ -17,6 +17,6 @@
 
 	<channel id="stdinToJmsoutChannel"/>
 
-	<jms:outbound-channel-adapter id="jmsout" channel="stdinToJmsoutChannel" destination="demoQueue"/>
+	<jms:outbound-channel-adapter id="jmsout" channel="stdinToJmsoutChannel" destination="requestQueue"/>
 
 </beans:beans>
diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml
index fae3ed5026..f5b1351cc2 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/jms/outboundGateway.xml
@@ -19,7 +19,9 @@
 
 	<channel id="stdinToJmsoutChannel"/>
 
-	<jms:outbound-gateway request-channel="stdinToJmsoutChannel" jms-queue="demoQueue" reply-channel="jmsReplyToStdoutChannel"/>
+	<jms:outbound-gateway request-channel="stdinToJmsoutChannel"
+						  request-destination="requestQueue"
+						  reply-channel="jmsReplyToStdoutChannel"/>
 
 	<channel id="jmsReplyToStdoutChannel"/>