Improve CacheHelper and cache management code
Apply the same overall fixes for phones