Merge "Fix thread safety issue on clearing cache"