Added disk caching.