Moving and adding to the cache tests