diff --git a/tests/test_setup.py b/tests/test_setup.py
index a6f2756d27e..2198ae7bb90 100644
--- a/tests/test_setup.py
+++ b/tests/test_setup.py
@@ -1,7 +1,7 @@
 import pytest
 import responses
 from celery import current_app
-from django.core.cache import caches
+from django.core.cache import cache
 from django.core.management import call_command
 
 from treeherder.utils.http import fetch_text
@@ -28,8 +28,6 @@ def test_no_missing_migrations():
 
 def test_django_cache():
     """Test the Django cache backend & associated server are properly set up."""
-    cache = caches['default']
-
     k, v = 'my_key', 'my_value'
     cache.set(k, v, 10)
     assert cache.get(k) == v
diff --git a/treeherder/model/error_summary.py b/treeherder/model/error_summary.py
index b4ab85552d9..f2a1f8d9a78 100644
--- a/treeherder/model/error_summary.py
+++ b/treeherder/model/error_summary.py
@@ -3,7 +3,7 @@
 import re
 import newrelic.agent
 
-from django.core.cache import caches
+from django.core.cache import cache
 
 from treeherder.model.models import Bugscache, TextLogError
 
@@ -32,8 +32,6 @@ def get_error_summary(job, queryset=None):
 
     Caches the results if there are any.
     """
-    db_cache = caches['default']
-    cache = caches['default']
     cache_key = 'error-summary-{}'.format(job.id)
     cached_error_summary = cache.get(cache_key)
     if cached_error_summary is not None:
@@ -43,7 +41,7 @@ def get_error_summary(job, queryset=None):
     line_cache_key = 'mc_error_lines'
     if job.repository == "comm-central":
         line_cache_key = 'cc_error_lines'
-    line_cache = db_cache.get(line_cache_key)
+    line_cache = cache.get(line_cache_key)
     if line_cache is None:
         line_cache = {str(job.submit_time.date()): {}}
     else:
@@ -85,7 +83,7 @@ def get_error_summary(job, queryset=None):
         logger.error('error caching error_summary for job %s: %s', job.id, e, exc_info=True)
 
     try:
-        db_cache.set(line_cache_key, line_cache, LINE_CACHE_TIMEOUT)
+        cache.set(line_cache_key, line_cache, LINE_CACHE_TIMEOUT)
     except Exception as e:
         newrelic.agent.record_custom_event('error caching error_lines for job', job.id)
         logger.error('error caching error_lines for job %s: %s', job.id, e, exc_info=True)
diff --git a/treeherder/webapp/api/note.py b/treeherder/webapp/api/note.py
index cd97cb32ce3..53242bb29f2 100644
--- a/treeherder/webapp/api/note.py
+++ b/treeherder/webapp/api/note.py
@@ -1,4 +1,4 @@
-from django.core.cache import caches
+from django.core.cache import cache
 
 from rest_framework import viewsets
 from rest_framework.decorators import action
@@ -93,8 +93,7 @@ def create(self, request, project):
         if fc_id == 2:  # this is for fixed_by_commit (backout | follow_up_commit)
             # remove cached failure line counts
             line_cache_key = 'error_lines'
-            db_cache = caches['default']
-            line_cache = db_cache.get(line_cache_key)
+            line_cache = cache.get(line_cache_key)
             date = current_job.submit_time.date().isoformat()
             if line_cache and date in line_cache.keys():
                 for err in TextLogError.objects.filter(job=current_job):
@@ -108,7 +107,7 @@ def create(self, request, project):
                         ):
                             del line_cache[date]["new_lines"][cache_clean_line]
                         try:
-                            db_cache.set(line_cache_key, line_cache, LINE_CACHE_TIMEOUT)
+                            cache.set(line_cache_key, line_cache, LINE_CACHE_TIMEOUT)
                         except Exception as e:
                             logger.error(
                                 'error caching error_lines for job %s: %s',