Fix avatars for contacts
Cache results