Fix Pkg.Cache paths, closes #5615 and #5612