Fix up unit tests for new cache format