Merge "Fix AttributeCache" into nyc-mr1-dev