Improve cache refresh mechanism (issue #3721)