I did have not reached the mock 2011 yet. But OAS itself only reflects Credit and Liquidity risk. The optionality feature is already removed. Which is the reason why Z spread = OAS + Option Cost where Z spread itself reflects all 3 of the risks (credit, liqudity, and option).