Various build fixes for disk cache code