Revert "Fix issue with chunk caching patch"

This reverts commit 93d4dc070a9be8bbcf4102181cafe06d1d05c182.