WIP moved store cache methods to store