Rename events. Remove dock blocks. Remove resolver from event.
Added comments
fix tests for cache manager
Added tests for PreResolve and PostResolve events