Improve cache resolver event system