fix #2771: cache archived status not updated on refresh
Merge branch 'issue-2771' into upstream