fixes + easy switch between cache stores