Added disk based caching