TS-2982: Interim cache compile errors.