Merge branch 'bp/test-drop-caches-for-windows'