Fixed small issue affecting caching of first batch.