diff --git a/keystoneclient/openstack/common/memorycache.py b/keystoneclient/openstack/common/memorycache.py
index 18d2cf3ae..589048e94 100644
--- a/keystoneclient/openstack/common/memorycache.py
+++ b/keystoneclient/openstack/common/memorycache.py
@@ -1,5 +1,3 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
 # All Rights Reserved.
@@ -57,11 +55,11 @@ class Client(object):
     def get(self, key):
         """Retrieves the value for a key or None.
 
-           this expunges expired keys during each get
+        This expunges expired keys during each get.
         """
 
         now = timeutils.utcnow_ts()
-        for k in self.cache.keys():
+        for k in list(self.cache):
             (timeout, _value) = self.cache[k]
             if timeout and now >= timeout:
                 del self.cache[k]
diff --git a/openstack-common.conf b/openstack-common.conf
index 93e402bce..fce2a7500 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -5,6 +5,7 @@ module=apiclient
 module=importutils
 module=install_venv_common
 module=jsonutils
+module=memorycache
 module=strutils
 module=timeutils
 module=py3kcompat