Fix caching to handle context path changes.

@bug W-2337337@

@rev byao@
Merging origin/goliver/master-pending-client-lib-cache into master