diff --git a/.travis.yml b/.travis.yml
index 5a5c23a..8bb54ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ python: 2.7
 env:
   - DJANGO_VERSION=1.7.*
   - DJANGO_VERSION=1.8.*
+  - DJANGO_VERSION=1.9.*
 install:
   - pip install django==$DJANGO_VERSION
   - python setup.py install
diff --git a/src/extras/template.py b/src/extras/template.py
index 5a0f3a3..e1a8bcf 100644
--- a/src/extras/template.py
+++ b/src/extras/template.py
@@ -27,7 +27,20 @@
 from inspect import getargspec
 
 from django.template import Context
-from django.template.base import generic_tag_compiler, TagHelperNode, Template
+try:
+    from django.template.base import generic_tag_compiler, TagHelperNode, Template
+except ImportError:
+    # Django 1.9+
+    from django.template.base import Template
+    from django.template.library import parse_bits, TagHelperNode
+
+    # copied from Django 1.8 source, since this function was removed in 1.9
+    def generic_tag_compiler(parser, token, params, varargs, varkw, defaults,
+                             name, takes_context, node_class):
+        bits = token.split_contents()[1:]
+        args, kwargs = parse_bits(parser, bits, params, varargs, varkw,
+                                  defaults, takes_context, name)
+        return node_class(takes_context, args, kwargs)
 from django.utils.itercompat import is_iterable
 from django.utils import six
 
diff --git a/src/marinade.py b/src/marinade.py
index 298e8f4..926feb1 100644
--- a/src/marinade.py
+++ b/src/marinade.py
@@ -26,7 +26,6 @@
 
 from django.db.models import Model
 from django.db.models.query import QuerySet
-from django.contrib.auth.models import AnonymousUser
 
 from .utils import force_str
 
@@ -58,10 +57,7 @@ def marinade_dish(arg):
     if isinstance(arg, list):
         return '[%s]' % ','.join([marinade_dish(item) for item in arg])
     if isinstance(arg, Model):
-        # ESPUsers are also instances of AnonymousUser, but might not be
-        # anonymous.
-        if arg.id is None and (not isinstance(arg, AnonymousUser) or
-                               not arg.is_anonymous()):
+        if arg.id is None:
             import random
             # TODO: Make this log something
             print "PASSING UNSAVED MODEL!!! ERROR!!! CACHING CODE SHOULD NOT BE ENABLED!!!"