Merge "Make #getCache and #putCache require INTERACT_ACROSS_USERS."