Cache role lookup

Change-Id: I8da4794c1fe88b60cf3f2f21922e50d3d056f8ac
Merge "Cache role lookup"