Fixing avatar caching