Avoid type-name conflicts causing cache conflicts (makes the cache per-T; also avoids locking on the happy-path)