Add network / disk caching