Update stage caching with the help of @laurelfan and @cpirich