Updated tests and file based cache.