Updated to use new avatar cache.