(fix) refactored cache store