Merge branch 'gs/test-unset-xdg-cache-home'