Shifts some common cache stuff into the super-datum.

Change-Id: I80f1eac5b42324fb2c169160210cedd51245bd9a