removed unnecessary call to CachedBatches.shutdown()
improving data generator