Update master with develop

This PR updates master with develop so we can tag a release with support for caching!