SM-13390 clusterable caching updates