added more events and removed unneeded cache entry