diff --git a/mistral/actions/openstack/base.py b/mistral/actions/openstack/base.py
index 02f156b2c..47ea934e7 100644
--- a/mistral/actions/openstack/base.py
+++ b/mistral/actions/openstack/base.py
@@ -84,6 +84,13 @@ class OpenStackAction(base.Action):
         (e.g. Nova, Glance, Heat, Keystone etc)
 
         """
+
+        # TODO(d0ugal): Caching has caused some security problems and
+        #               regressions in Mistral. It is disabled for now and
+        #               will be revisited in Ocata. See:
+        #               https://bugs.launchpad.net/mistral/+bug/1627689
+        return self._create_client()
+
         ctx = context.ctx()
         client_class = self.__class__.__name__
         # Colon character is reserved (rfc3986) which avoids key collisions.
diff --git a/mistral/tests/unit/actions/openstack/test_openstack_actions.py b/mistral/tests/unit/actions/openstack/test_openstack_actions.py
index c072444cd..bcc45934f 100644
--- a/mistral/tests/unit/actions/openstack/test_openstack_actions.py
+++ b/mistral/tests/unit/actions/openstack/test_openstack_actions.py
@@ -123,7 +123,8 @@ class OpenStackActionTest(base.BaseTestCase):
         mock_novaclient.reset_mock()
         action.run()
 
-        mock_novaclient.Client.assert_not_called()
+        # TODO(d0ugal): Uncomment the following line when caching is fixed.
+        # mock_novaclient.Client.assert_not_called()
         mock_novaclient.Client().servers.get.assert_called_with(
             server="1234-abcd")