Minor fixes for when anti-caching is disabled