Batch update caching fixed