Merge branch 'master' into menu_restructure

1 files changed, 3 insertions, 0 deletions

diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts
index 6fa8cf909..2fe3e9778 100644
--- a/src/client/DocServer.ts
+++ b/src/client/DocServer.ts
@@ -372,6 +372,9 @@ export namespace DocServer {
                         } else if (cached instanceof Promise) {
                             proms.push(cached as any);
                         }
+                    } else if (field) {
+                        proms.push(_cache[field.id] as any);
+                        fieldMap[field.id] = field;
                     }
                 }
             });