SWC-456: use single handler instance instead of registration