Cache support refactoring