use persistent storage
use cached avatars properly