diff --git a/combo/middleware.py b/combo/middleware.py
index 1300aafd..03c0e8d1 100644
--- a/combo/middleware.py
+++ b/combo/middleware.py
@@ -16,6 +16,8 @@
 
 import threading
 
+from django.utils.deprecation import MiddlewareMixin
+
 
 _requests = {}
 
@@ -23,7 +25,7 @@ def get_request():
     return _requests.get(threading.current_thread())
 
 
-class GlobalRequestMiddleware(object):
+class GlobalRequestMiddleware(MiddlewareMixin):
     def process_request(self, request):
         _requests[threading.current_thread()] = request
         request.cache = {}
diff --git a/combo/settings.py b/combo/settings.py
index 0d227f81..8d2982e7 100644
--- a/combo/settings.py
+++ b/combo/settings.py
@@ -85,7 +85,7 @@ INSTALLED_APPS = (
     'xstatic.pkg.leaflet_markercluster',
 )
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'combo.middleware.GlobalRequestMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',