Backport disable caching

I would like to have disable caching on the stable branch, so I can use it in production before the new major release.