Add method for clearing the cache
Move tag stores