incorporate suggestions

Author: rahul2393

google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/KeyAwareChannel.java

@@ -367,16 +367,14 @@ public void halfClose() {
     public void cancel(@Nullable String message, @Nullable Throwable cause) {
       if (delegate != null) {
         delegate.cancel(message, cause);
-      } else if (responseListener != null) {
-        responseListener.onClose(
-            io.grpc.Status.CANCELLED.withDescription(message).withCause(cause), new Metadata());
-        cancelled = true;
-        cancelMessage = message;
-        cancelCause = cause;
       } else {
         cancelled = true;
         cancelMessage = message;
         cancelCause = cause;
+        if (responseListener != null) {
+          responseListener.onClose(
+              io.grpc.Status.CANCELLED.withDescription(message).withCause(cause), new Metadata());
+        }
       }
     }
 
@@ -493,6 +491,9 @@ public void onMessage(ResponseT message) {
         transactionId = transactionIdFromMetadata(response);
       } else if (message instanceof ResultSet) {
         ResultSet response = (ResultSet) message;
+        if (response.hasCacheUpdate() && call.channelFinder != null) {
+          call.channelFinder.update(response.getCacheUpdate());
+        }
         transactionId = transactionIdFromMetadata(response);
       } else if (message instanceof Transaction) {
         Transaction response = (Transaction) message;