Re-enabled caching, renamed files