Fix race condition using independent reader and writers for each call

Change-Id: I3821859832f82867cf74586204ff2b6307d84eda