Merge "Update GenderCache to use NamespaceInfo"