[WIP] Added resolve events to cache manager

WIP