Turned on data caching again (forgot to turn it back on for previous commit)