Fixed caching logic in getReadyQueueMap()

Change-Id: Ie67dedd12a00f95dc7840123bdbb8be354fe47da
Merge "Fixed caching logic in getReadyQueueMap()"