better handling of cluster context caching