apply restrict_view_filters() after checking cache: AND-ing restrictions will prevent cache hits!
Merge commit 'github/testing' into beta