Merge "GENDER should use the GenderCache"