Add ms cache for batching to work properly