Refactor cache storage options