Improved cache service

Cache now relies on the URL rather than the handle