Merge "Fix thread safety issue on clearing cache" into rvc-qpr-dev