[bug 960979] Add cache-machine to UserAvatar.
Merge pull request #595 from johngian/avatar-cache

[bug 960979] Add cache-machine to UserAvatar.