Merge branch 'develop' into stable

1 files changed, 5 insertions, 5 deletions

diff --git a/src/SMAPI/Framework/Reflection/CacheEntry.cs b/src/SMAPI/Framework/Reflection/CacheEntry.cs
index 912662e3..27f48a1f 100644
--- a/src/SMAPI/Framework/Reflection/CacheEntry.cs
+++ b/src/SMAPI/Framework/Reflection/CacheEntry.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 namespace StardewModdingAPI.Framework.Reflection
@@ -9,21 +10,20 @@ namespace StardewModdingAPI.Framework.Reflection
         ** Accessors
         *********/
         /// <summary>Whether the lookup found a valid match.</summary>
-        public bool IsValid { get; }
+        [MemberNotNullWhen(true, nameof(CacheEntry.MemberInfo))]
+        public bool IsValid => this.MemberInfo != null;
 
         /// <summary>The reflection data for this member (or <c>null</c> if invalid).</summary>
-        public MemberInfo MemberInfo { get; }
+        public MemberInfo? MemberInfo { get; }
 
 
         /*********
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
-        /// <param name="isValid">Whether the lookup found a valid match.</param>
         /// <param name="memberInfo">The reflection data for this member (or <c>null</c> if invalid).</param>
-        public CacheEntry(bool isValid, MemberInfo memberInfo)
+        public CacheEntry(MemberInfo? memberInfo)
         {
-            this.IsValid = isValid;
             this.MemberInfo = memberInfo;
         }
     }