OSCP stapling (which OP mentions) is supposed to fix that though.