Merge "Use a cached context when possible." into honeycomb