Ensure checkmode is honored for templates that haven't changed

    Fixes #8998