#3334 added a cache for name lookup