Merge "Improve cache assertions in WatchedItemStoreUnitTest"