Improved cachebust scraping