Make cached requests depend on logged in user

Change-Id: I31821a431c4ac44409d4e08e1d76ddc3ab19686b
Merge "Make cached requests depend on logged in user"