Merge "[Lock] Reset lock file content cache in waiting function"