Fix some other caching issues with content_cache