Merge "Do not hold onto the master lock while reading data from the...

Merge "Do not hold onto the master lock while reading data from the datasource. This would prevent consumers from reading cached data immediately if it is available."