IMPROVED: icon_cache_key performance