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