Adapt xcache tests.