Merge "Actually use the cache for names and icons."