diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserCachingTests-context.xml b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserCachingTests-context.xml
new file mode 100644
index 0000000000..afd3ab665f
--- /dev/null
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserCachingTests-context.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans
+		xmlns="http://www.springframework.org/schema/integration"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:p="http://www.springframework.org/schema/p"
+		xmlns:context="http://www.springframework.org/schema/context"
+		xmlns:util="http://www.springframework.org/schema/util"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		xmlns:lang="http://www.springframework.org/schema/lang"
+		xmlns:sftp="http://www.springframework.org/schema/integration/sftp"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+						http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+					 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
+						http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.0.xsd
+						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd
+						http://www.springframework.org/schema/integration/sftp http://www.springframework.org/schema/integration/sftp/spring-integration-sftp-2.0.xsd">
+
+	<channel id="requestChannel">
+		<queue/>
+	</channel>
+	
+	<beans:bean id="sftpSessionFactory" class="org.springframework.integration.sftp.session.DefaultSftpSessionFactory">
+		<beans:property name="host" value="loclahost"/>
+		<beans:property name="knownHosts" value="local, foo.com, bar.foo"/>
+		<beans:property name="privateKey" value="classpath:org/springframework/integration/sftp/config/sftpTest"/>
+		<beans:property name="privateKeyPassphrase" value="ghj"/>
+		<beans:property name="password" value="hello"/>
+		<beans:property name="port" value="2222"/>
+		<beans:property name="user" value="oleg"/>
+	</beans:bean>
+
+	<sftp:inbound-channel-adapter id="cachingAdapter"
+			session-factory="sftpSessionFactory"
+			channel="requestChannel"
+			remote-directory="/foo"
+			local-directory="file:local-test-dir"
+			auto-startup="false">
+		<poller fixed-rate="1000"/>
+	</sftp:inbound-channel-adapter>
+
+	<sftp:inbound-channel-adapter id="nonCachingAdapter"
+			session-factory="sftpSessionFactory"
+			cache-sessions="false"
+			channel="requestChannel"
+			remote-directory="/foo"
+			local-directory="file:local-test-dir"
+			auto-startup="false">
+		<poller fixed-rate="1000"/>
+	</sftp:inbound-channel-adapter>
+	
+</beans:beans>
diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserCachingTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserCachingTests.java
new file mode 100644
index 0000000000..16953ad2af
--- /dev/null
+++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserCachingTests.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2002-2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.integration.sftp.config;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.file.remote.session.CachingSessionFactory;
+import org.springframework.integration.sftp.session.DefaultSftpSessionFactory;
+import org.springframework.integration.test.util.TestUtils;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class InboundChannelAdapterParserCachingTests {
+
+	@Autowired private Object cachingAdapter;
+
+	@Autowired private Object nonCachingAdapter;
+
+
+	@Test
+	public void cachingAdapter() {
+		Object sessionFactory = TestUtils.getPropertyValue(cachingAdapter, "source.synchronizer.sessionFactory");
+		assertEquals(CachingSessionFactory.class, sessionFactory.getClass());
+	}
+
+	@Test
+	public void nonCachingAdapter() {
+		Object sessionFactory = TestUtils.getPropertyValue(nonCachingAdapter, "source.synchronizer.sessionFactory");
+		assertEquals(DefaultSftpSessionFactory.class, sessionFactory.getClass());
+	}
+
+}