diff --git a/zephyr/lib/actions.py b/zephyr/lib/actions.py
index 916b7e609e..09387caacf 100644
--- a/zephyr/lib/actions.py
+++ b/zephyr/lib/actions.py
@@ -9,7 +9,7 @@ from django.db import transaction, IntegrityError
 from django.db.models import F
 from zephyr.lib.initial_password import initial_password
 from zephyr.lib.timestamp import timestamp_to_datetime, datetime_to_timestamp
-from zephyr.lib.message_cache import cache_save_message
+from zephyr.lib.cache_helpers import cache_save_message
 from zephyr.lib.queue import SimpleQueueClient
 from django.utils import timezone
 from zephyr.lib.create_user import create_user
diff --git a/zephyr/lib/message_cache.py b/zephyr/lib/cache_helpers.py
similarity index 84%
rename from zephyr/lib/message_cache.py
rename to zephyr/lib/cache_helpers.py
index 1f6fc233f7..cfb2babde1 100644
--- a/zephyr/lib/message_cache.py
+++ b/zephyr/lib/cache_helpers.py
@@ -1,3 +1,6 @@
+# This file needs to be different from cache.py because cache.py
+# cannot import anything from zephyr.models or we'd have an import
+# loop
 from zephyr.models import Message
 from zephyr.lib.cache import cache_with_key, djcache, message_cache_key
 
diff --git a/zephyr/management/commands/fill_memcached_caches.py b/zephyr/management/commands/fill_memcached_caches.py
index 099ed75b13..da066f1c19 100644
--- a/zephyr/management/commands/fill_memcached_caches.py
+++ b/zephyr/management/commands/fill_memcached_caches.py
@@ -1,6 +1,6 @@
 from optparse import make_option
 from django.core.management.base import BaseCommand
-from zephyr.lib.message_cache import populate_message_cache
+from zephyr.lib.cache_helpers import populate_message_cache
 
 class Command(BaseCommand):
     option_list = BaseCommand.option_list
diff --git a/zephyr/tornadoviews.py b/zephyr/tornadoviews.py
index dddeb66fbb..96a8b8f705 100644
--- a/zephyr/tornadoviews.py
+++ b/zephyr/tornadoviews.py
@@ -19,7 +19,7 @@ import logging
 import subprocess
 from django.core.cache import cache
 from zephyr.lib.cache import cache_with_key
-from zephyr.lib.message_cache import cache_save_message, cache_get_message
+from zephyr.lib.cache_helpers import cache_save_message, cache_get_message
 
 SERVER_GENERATION = int(time.time())