Insert middleware and upgrade wat_catcher