Added endpoint caching.