Refactored cache support