WIP: Added caching for URL's