diff --git a/bugheist/settings.py b/bugheist/settings.py
index 68bbd8230..34b905707 100644
--- a/bugheist/settings.py
+++ b/bugheist/settings.py
@@ -68,7 +68,7 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'rollbar.contrib.django.middleware.RollbarNotifierMiddleware',
- 
+
 )
 
 TESTING = len(sys.argv) > 1 and sys.argv[1] == 'test'
@@ -104,7 +104,7 @@
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [],
-        'APP_DIRS': True,
+        'APP_DIRS': False,
         'OPTIONS': {
             'debug': True,
             'context_processors': [
@@ -115,6 +115,12 @@
                 'django.contrib.messages.context_processors.messages',
                 'django.template.context_processors.i18n',
             ],
+            'loaders': [
+                ('django.template.loaders.cached.Loader', [
+                    'django.template.loaders.filesystem.Loader',
+                    'django.template.loaders.app_directories.Loader',
+                ]),
+            ],
         },
     },
 ]
@@ -124,6 +130,17 @@
     'allauth.account.auth_backends.AuthenticationBackend',
 )
 
+SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db'
+
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.db.DatabaseCache',
+        'LOCATION': 'cache_table',
+    }
+}
+
+CONN_MAX_AGE = None
+
 WSGI_APPLICATION = 'bugheist.wsgi.application'
 
 # Database