Refactored cache options