fix(event_handler): resolve dependency injection failure with arbitrary return types

fix(event_handler): resolve dependency injection failure with arbitrary return types #10481