Added name caching (alongside ID caching) to speed up calls to get names/IDs