Merge "Fix issue #72151749: Lock down 'clear cache' functionality to..."