Fixes for RASR/SSH changes to work on windows/cache