Bring back cache control for tests