Finished up caching