Added caching of urls