diff --git a/src/utils/connectToStores.js b/src/utils/connectToStores.js
index 848053a8..0e5e568c 100644
--- a/src/utils/connectToStores.js
+++ b/src/utils/connectToStores.js
@@ -10,7 +10,7 @@
  *
  *    const MyComponent = React.createClass({
  *      statics: {
- *        getStores() {
+ *        getStores(props) {
  *          return [myStore]
  *        },
  *        getPropsFromStores(props) {
@@ -27,7 +27,7 @@
  * Example using ES6 Class:
  *
  *    class MyComponent extends React.Component {
- *      static getStores() {
+ *      static getStores(props) {
  *        return [myStore]
  *      }
  *      static getPropsFromStores(props) {
@@ -55,9 +55,6 @@ function connectToStores(Component) {
     throw new Error('connectToStores() expects the wrapped component to have a static getPropsFromStores() method')
   }
 
-  // Cache stores.
-  const stores = Component.getStores()
-
   // Wrapper Component.
   const StoreConnection = React.createClass({
     getInitialState() {
@@ -65,12 +62,14 @@ function connectToStores(Component) {
     },
 
     componentDidMount() {
+      const stores = Component.getStores(this.props)
       stores.forEach((store) => {
         store.listen(this.onChange)
       })
     },
 
     componentWillUnmount() {
+      const stores = Component.getStores(this.props)
       stores.forEach((store) => {
         store.unlisten(this.onChange)
       })
diff --git a/test/connect-to-stores-test.js b/test/connect-to-stores-test.js
index 4a28f871..c747a97d 100644
--- a/test/connect-to-stores-test.js
+++ b/test/connect-to-stores-test.js
@@ -109,6 +109,27 @@ export default {
       assert.include(output, 'Foo: Bar')
     },
 
+    'component can get use stores from props'() {
+      const LegacyComponent = React.createClass({
+        statics: {
+          getStores(props) {
+            return [props.store]
+          },
+          getPropsFromStores(props) {
+            return props.store.getState()
+          }
+        },
+        render() {
+          return React.createElement('div', null, `Foo${this.props.delim}${this.props.foo}`)
+        }
+      })
+
+      const WrappedComponent = connectToStores(LegacyComponent)
+      const element = React.createElement(WrappedComponent, {delim: ': ', store: testStore})
+      const output = React.renderToStaticMarkup(element)
+      assert.include(output, 'Foo: Bar')
+    },
+
     'ES6 class component responds to store events'() {
       class ClassComponent extends React.Component {
         static getStores() {