Fix output contexts cache p2