Caching moved to separate class; Unsafe existing cache file recognition added