b8990f39b0
Merge commit 'fbd8f69a84163ef1cf52b07966320caf448c2bc9' * commit 'fbd8f69a84163ef1cf52b07966320caf448c2bc9': Fixes #1946141. Introduce new caching API to control scaling.