Revert "Naming improvements for cache files; disable cache cleanup for better performance"

This reverts commit af410a915425e647733baccec4a4ba12720845a9.