Refactoring Cache specs