cache-only flag added to cleanup