rework store/cache api