Merge "Properly invalidate text classification cache." into oc-dev