Bug 870171 - Review comment: Correctly cache current environment.