Merge "Add lock to update mCache from the constructor" into main