Finished integrating the cache the whole museum stuff