Django compatibility: Test fixes to account for caching and misc tweaks