fixed over-caching of name variants