Added caching of resolved values as well as the ability to clear the cache etc.