I tend to think we should not pass resolver in pre and post events. Let's drop it for now.