Refactoring Cache Packages