Moved cache location of other stuff