diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
index 3bcc61302fbf5596985128ecd6fb577550958e76..f07a746c274c12f6707fc895c445d1ea46795abc 100644
--- a/indra/newview/llavatariconctrl.cpp
+++ b/indra/newview/llavatariconctrl.cpp
@@ -121,7 +121,7 @@ void LLAvatarIconIDCache::save	()
 		return;
 	}
 
-	for(std::map<LLUUID,LLAvatarIconIDCacheItem>::iterator it = mCache.begin();it!=mCache.end();++it)
+	for(auto it = mCache.begin();it!=mCache.end();++it)
 	{
 		if(!it->second.expired())
 		{
@@ -134,7 +134,7 @@ void LLAvatarIconIDCache::save	()
 
 LLUUID*	LLAvatarIconIDCache::get		(const LLUUID& avatar_id)
 {
-	std::map<LLUUID,LLAvatarIconIDCacheItem>::iterator it = mCache.find(avatar_id);
+	auto it = mCache.find(avatar_id);
 	if(it==mCache.end())
 		return 0;
 	if(it->second.expired())
diff --git a/indra/newview/llavatariconctrl.h b/indra/newview/llavatariconctrl.h
index 9dfee681fad1886f153e0bcc537d3628fa0d326f..ec3a97c634d3e9cf2edbee4bb8348d24091561b6 100644
--- a/indra/newview/llavatariconctrl.h
+++ b/indra/newview/llavatariconctrl.h
@@ -58,7 +58,7 @@ class LLAvatarIconIDCache final : public LLSingleton<LLAvatarIconIDCache>
 	
 
 	std::string	mFilename;
-	std::map<LLUUID,LLAvatarIconIDCacheItem> mCache;//we cache only LLUID and time
+	absl::flat_hash_map<LLUUID,LLAvatarIconIDCacheItem> mCache;//we cache only LLUID and time
 };
 
 inline