caching_fixes#11