Django compatibility: Fixes to account for caching and misc tweaks