Refactored cache control to be lighter