fixing events caching