diff --git a/cachalot/settings.py b/cachalot/settings.py
index e383508..a86be2b 100644
--- a/cachalot/settings.py
+++ b/cachalot/settings.py
@@ -4,15 +4,15 @@ from django.conf import settings
 class SettingsOverrider(object):
     def __init__(self, settings, overrides):
         self.settings = settings
-        self.overrides = overrides
-        self.originals = {k: getattr(self.settings, k) for k in self.overrides}
+        self.overrides = overrides.items()
+        self.originals = [(k, getattr(settings, k)) for k in overrides]
 
     def __enter__(self):
-        for k, v in self.overrides.items():
+        for k, v in self.overrides:
             setattr(self.settings, k, v)
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        for k, v in self.originals.items():
+        for k, v in self.originals:
             setattr(self.settings, k, v)
 
     def __call__(self, func):