Merge pull request #610 from ariard/2020-04-cache-in-monitor