Fixed the caching of StepContexts across steps