#761 - Minor improvements to caching
#791 Added Unit Tests for URLHandler