Fixed bug with Django 1.6 causing infinite timeouts

Fixed bug with Django 1.6 that caused keys set without a specified timeout to cache infinitely, instead of using the default cache.  Behavior with Django <1.6 is preserved.