diff --git a/client/src/graphql/appointments.queries.js b/client/src/graphql/appointments.queries.js
index 51117f39f..4d433d3f7 100644
--- a/client/src/graphql/appointments.queries.js
+++ b/client/src/graphql/appointments.queries.js
@@ -31,6 +31,7 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
       color
       note
       job {
+        id
         scheduled_in
         scheduled_completion
         alt_transport
@@ -44,7 +45,6 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
         ownr_ph2_ty
         ownr_ea
         clm_total
-        id
         clm_no
         ins_co_nm
         v_model_yr
@@ -156,6 +156,7 @@ export const QUERY_APPOINTMENT_BY_DATE = gql`
       color
       note
       job {
+        id
         alt_transport
         ro_number
         ownr_ln
@@ -164,7 +165,6 @@ export const QUERY_APPOINTMENT_BY_DATE = gql`
         ownr_ph2
         ownr_ea
         clm_total
-        id
         clm_no
         vehicle {
           id
diff --git a/client/src/graphql/associations.queries.js b/client/src/graphql/associations.queries.js
index 8179448d4..45683edce 100644
--- a/client/src/graphql/associations.queries.js
+++ b/client/src/graphql/associations.queries.js
@@ -6,6 +6,7 @@ export const QUERY_ALL_ASSOCIATIONS = gql`
       id
       active
       bodyshop {
+        id
         shopname
       }
     }
diff --git a/client/src/graphql/cccontracts.queries.js b/client/src/graphql/cccontracts.queries.js
index 8e4800f23..995135453 100644
--- a/client/src/graphql/cccontracts.queries.js
+++ b/client/src/graphql/cccontracts.queries.js
@@ -101,9 +101,9 @@ export const QUERY_CONTRACT_BY_PK = gql`
         ownerid
         vehicleid
         owner {
+          id
           ownr_fn
           ownr_ln
-          id
           ownr_co_nm
         }
         vehicle {
diff --git a/client/src/graphql/courtesy-car.queries.js b/client/src/graphql/courtesy-car.queries.js
index a7433e940..b17dadd6f 100644
--- a/client/src/graphql/courtesy-car.queries.js
+++ b/client/src/graphql/courtesy-car.queries.js
@@ -84,10 +84,10 @@ export const QUERY_ALL_CC = gql`
         scheduledreturn
         job {
           id
+          ro_number
           ownr_fn
           ownr_ln
           ownr_co_nm
-          ro_number
         }
       }
     }
@@ -139,10 +139,10 @@ export const QUERY_CC_BY_PK = gql`
         status
         job {
           id
-          ownr_ln
-          ownr_fn
-          ownr_co_nm
           ro_number
+          ownr_fn
+          ownr_ln
+          ownr_co_nm
         }
       }
     }
diff --git a/client/src/graphql/inventory.queries.js b/client/src/graphql/inventory.queries.js
index 28f3412b5..295733efc 100644
--- a/client/src/graphql/inventory.queries.js
+++ b/client/src/graphql/inventory.queries.js
@@ -48,6 +48,7 @@ export const QUERY_OUTSTANDING_INVENTORY = gql`
         bill {
           invoice_number
           vendor {
+            id
             name
           }
         }
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 477b0801e..e32163b1a 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -2116,6 +2116,7 @@ export const QUERY_GET_TASKS_JOB_DETAILS_BY_ID = gql`
       bills {
         id
         vendor {
+          id
           name
         }
         invoice_number
@@ -2123,6 +2124,7 @@ export const QUERY_GET_TASKS_JOB_DETAILS_BY_ID = gql`
       parts_orders {
         id
         vendor {
+          id
           name
         }
         order_number
diff --git a/client/src/graphql/parts-orders.queries.js b/client/src/graphql/parts-orders.queries.js
index de4f07cee..264e7d7a5 100644
--- a/client/src/graphql/parts-orders.queries.js
+++ b/client/src/graphql/parts-orders.queries.js
@@ -218,6 +218,7 @@ export const QUERY_PARTS_ORDER_OEC = gql`
         v_model_yr
         v_vin
         vehicle {
+          id
           v_bstyle
           v_type
           v_trimcode
diff --git a/client/src/graphql/tasks.queries.js b/client/src/graphql/tasks.queries.js
index 76eaf452c..6f96733fa 100644
--- a/client/src/graphql/tasks.queries.js
+++ b/client/src/graphql/tasks.queries.js
@@ -30,6 +30,7 @@ export const PARTIAL_TASK_FIELDS = gql`
       bills {
         id
         vendor {
+          id
           name
         }
         invoice_number
@@ -37,6 +38,7 @@ export const PARTIAL_TASK_FIELDS = gql`
       parts_orders {
         id
         vendor {
+          id
           name
         }
         order_number
@@ -51,6 +53,7 @@ export const PARTIAL_TASK_FIELDS = gql`
     parts_order {
       id
       vendor {
+        id
         name
       }
       order_number
@@ -59,6 +62,7 @@ export const PARTIAL_TASK_FIELDS = gql`
     bill {
       id
       vendor {
+        id
         name
       }
       invoice_number
diff --git a/client/src/graphql/timetickets.queries.js b/client/src/graphql/timetickets.queries.js
index 84e2ae4ab..b69a9552c 100644
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -217,6 +217,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
     ) {
       id
       joblines(order_by: { line_no: asc }, where: { removed: { _eq: false } }) {
+        id
         convertedtolbr
         convertedtolbr_data
         mod_lb_hrs
diff --git a/client/src/utils/GraphQLClient.js b/client/src/utils/GraphQLClient.js
index 3c527a946..984685b7b 100644
--- a/client/src/utils/GraphQLClient.js
+++ b/client/src/utils/GraphQLClient.js
@@ -169,6 +169,15 @@ const link = ApolloLink.from(
  */
 const cache = new InMemoryCache({
   typePolicies: {
+    users: {
+      keyFields: ["email"]
+    },
+    masterdata: {
+      keyFields: ["key"]
+    },
+    job_conversations: {
+      keyFields: ["conversationid", "jobid"]
+    },
     Query: {
       fields: {
         conversations: {