Use events, not own stuff to fix caching of users