TRUNK-2671 Cache handlers in HandlerUtil