Integrate fixes to recipe, cache and step.