Follow-up for cache role lookup

Change-Id: Ib08999f600462d994283e0d6e89a9f44a9987bc3