More changes to the (ex)cache.