Change of cache directory name to better avoid conflict and moving methods that should not be public to private category to avoid confusion.