Merge "Fix ExtensionRegistry cache doc that is out of date"