Merge "Fix cache deletion for secondary users" into jb-mr1-dev