Clean up how cache works. Multiple stores.