Fixes with cache dir