[Builder] Fix Cache with ONBUILD Upstream-commit: f50249964788c144c2059f2c63e2f54473317ed3 Component: engine