And fixing the integration test assumptions about where ivy caches are