Stores' cache works again! Getting closer to a good implementation of stores