diff --git a/src/Connected.Entities/Caching/EntityCacheClient.cs b/src/Connected.Entities/Caching/EntityCacheClient.cs
index 36dea51..c838313 100644
--- a/src/Connected.Entities/Caching/EntityCacheClient.cs
+++ b/src/Connected.Entities/Caching/EntityCacheClient.cs
@@ -62,7 +62,7 @@ public abstract class EntityCacheClient<TEntity, TPrimaryKey> : StatefulCacheCli
 
 		try
 		{
-			if (OnInvalidating(ctx, id) is TEntity entity && entity is IPrimaryKey<TPrimaryKey> pk)
+			if ((await OnInvalidating(ctx, id)) is TEntity entity && entity is IPrimaryKey<TPrimaryKey> pk)
 				Set(pk.Id, entity, TimeSpan.Zero);
 
 			if (transaction is not null)
@@ -82,10 +82,6 @@ public abstract class EntityCacheClient<TEntity, TPrimaryKey> : StatefulCacheCli
 		if (context.GetService<IStorageProvider>() is not IStorageProvider provider)
 			return default;
 
-		var entities = await provider.Open<TEntity>().AsEntities();
-
-		var entity = entities.FirstOrDefault(e => e.Id.Equals(id));
-
 		return await (from dc in provider.Open<TEntity>()
 						  where TypeComparer.Compare(dc.Id, id)
 						  select dc).AsEntity();
diff --git a/src/Connected.Expressions/Expressions/SelectExpression.cs b/src/Connected.Expressions/Expressions/SelectExpression.cs
index a548d24..f440208 100644
--- a/src/Connected.Expressions/Expressions/SelectExpression.cs
+++ b/src/Connected.Expressions/Expressions/SelectExpression.cs
@@ -55,9 +55,9 @@ public sealed class SelectExpression : AliasedExpression
 		if (obj is not SelectExpression second)
 			return false;
 
-		return Alias.Equals(second.Alias)
-			&& Columns.Equals(second.Columns)
-			&& From.Equals(second.From)
+		return Alias == second.Alias
+			&& Columns == second.Columns
+			&& From  == second.From
 			&& Where == second.Where
 			&& OrderBy == second.OrderBy
 			&& GroupBy == second.GroupBy