Added icon.
Added name caching.