Update the handling of cached ::name()

  This was bogus, but is now correct.