* Fixed avatar caching going bonkers.
* Fix and saftey checks for avatar handling.