The trick now is as you say, get in to do an external window cleaned when the scaffolding is still up, then when they are ready for the full clean you can just go in with your WFP and give them a thorough wash.
We've got a three storey hotel to do this month, full builders clean including windows and this is exactly what we have agreed with the site foreman.