Added rest client caching