Merge "snapshotcache: replce global lock with local one" into main