Completed caching

Ready for release