More per-request caching for authorization information - EUCA-9271

EUCA-9271
Merge remote-tracking branch 'origin/dev/sjones/EUCA-9271' into testing
Update authorization caching fix - EUCA-9271