apply the cache fixes