Adding support for data caching