Added scraping cache + tests