[bug 960979] Add cache-machine to UserAvatar.