v7.01

Updated translations.
Updated ChangeLog.
2026-11-07 11:02:33 -05:00 · 2023-07-21 02:00:24 +03:00 · 2023-07-21 01:56:26 +03:00 · 2023-07-21 01:06:11 +03:00 · 2023-07-21 01:05:17 +03:00 · 2023-07-21 01:03:56 +03:00
150 changed files with 4175 additions and 6561 deletions
@@ -53,6 +53,88 @@ ongoworks:speakingurl
 raix:handlebar-helpers
 http@2.0.0! # force new http package

+# Datepicker
+rajit:bootstrap3-datepicker
+rajit:bootstrap3-datepicker-de
+rajit:bootstrap3-datepicker-tr
+rajit:bootstrap3-datepicker-ja
+rajit:bootstrap3-datepicker-fr
+rajit:bootstrap3-datepicker-it
+rajit:bootstrap3-datepicker-th
+rajit:bootstrap3-datepicker-nl
+rajit:bootstrap3-datepicker-es
+rajit:bootstrap3-datepicker-lv
+rajit:bootstrap3-datepicker-sv
+rajit:bootstrap3-datepicker-gl
+rajit:bootstrap3-datepicker-eu
+rajit:bootstrap3-datepicker-vi
+rajit:bootstrap3-datepicker-no
+rajit:bootstrap3-datepicker-en-gb
+rajit:bootstrap3-datepicker-ro
+rajit:bootstrap3-datepicker-rs
+rajit:bootstrap3-datepicker-ru
+rajit:bootstrap3-datepicker-bs
+rajit:bootstrap3-datepicker-mn
+rajit:bootstrap3-datepicker-id
+rajit:bootstrap3-datepicker-fa
+rajit:bootstrap3-datepicker-ko
+rajit:bootstrap3-datepicker-pt
+rajit:bootstrap3-datepicker-sl
+rajit:bootstrap3-datepicker-sq
+rajit:bootstrap3-datepicker-cy
+rajit:bootstrap3-datepicker-ka
+rajit:bootstrap3-datepicker-sr
+rajit:bootstrap3-datepicker-az
+rajit:bootstrap3-datepicker-cs
+rajit:bootstrap3-datepicker-me
+rajit:bootstrap3-datepicker-ta
+rajit:bootstrap3-datepicker-eo
+rajit:bootstrap3-datepicker-oc
+rajit:bootstrap3-datepicker-he
+rajit:bootstrap3-datepicker-sw
+rajit:bootstrap3-datepicker-rs-latin
+rajit:bootstrap3-datepicker-da
+rajit:bootstrap3-datepicker-pt-br
+rajit:bootstrap3-datepicker-br
+rajit:bootstrap3-datepicker-it-ch
+rajit:bootstrap3-datepicker-en-za
+rajit:bootstrap3-datepicker-en-ie
+rajit:bootstrap3-datepicker-en-ca
+rajit:bootstrap3-datepicker-uz-latn
+rajit:bootstrap3-datepicker-ms
+rajit:bootstrap3-datepicker-uk
+rajit:bootstrap3-datepicker-hu
+rajit:bootstrap3-datepicker-fo
+rajit:bootstrap3-datepicker-kr
+rajit:bootstrap3-datepicker-hi
+rajit:bootstrap3-datepicker-km
+rajit:bootstrap3-datepicker-fi
+rajit:bootstrap3-datepicker-is
+rajit:bootstrap3-datepicker-kh
+rajit:bootstrap3-datepicker-bg
+rajit:bootstrap3-datepicker-bn
+rajit:bootstrap3-datepicker-pl
+rajit:bootstrap3-datepicker-et
+rajit:bootstrap3-datepicker-ar
+rajit:bootstrap3-datepicker-ca
+rajit:bootstrap3-datepicker-kk
+rajit:bootstrap3-datepicker-sk
+rajit:bootstrap3-datepicker-el
+rajit:bootstrap3-datepicker-hy
+rajit:bootstrap3-datepicker-hr
+rajit:bootstrap3-datepicker-tg
+rajit:bootstrap3-datepicker-nb
+rajit:bootstrap3-datepicker-mk
+rajit:bootstrap3-datepicker-nl-be
+rajit:bootstrap3-datepicker-zh-cn
+rajit:bootstrap3-datepicker-ar-tn
+rajit:bootstrap3-datepicker-en-au
+rajit:bootstrap3-datepicker-fr-ch
+rajit:bootstrap3-datepicker-zh-tw
+rajit:bootstrap3-datepicker-uz-cyrl
+rajit:bootstrap3-datepicker-sr-latin
+rajit:bootstrap3-datepicker-en-nz
+
 # UI components
 ostrio:i18n
 reactive-var@1.0.12
@@ -135,6 +135,86 @@ percolate:synced-cron@1.3.2
 promise@0.12.2
 raix:eventemitter@0.1.3
 raix:handlebar-helpers@0.2.5
+rajit:bootstrap3-datepicker@1.7.1_1
+rajit:bootstrap3-datepicker-ar@1.7.1
+rajit:bootstrap3-datepicker-ar-tn@1.7.1
+rajit:bootstrap3-datepicker-az@1.7.1
+rajit:bootstrap3-datepicker-bg@1.7.1
+rajit:bootstrap3-datepicker-bn@1.7.1
+rajit:bootstrap3-datepicker-br@1.7.1
+rajit:bootstrap3-datepicker-bs@1.7.1
+rajit:bootstrap3-datepicker-ca@1.7.1
+rajit:bootstrap3-datepicker-cs@1.7.1
+rajit:bootstrap3-datepicker-cy@1.7.1
+rajit:bootstrap3-datepicker-da@1.7.1
+rajit:bootstrap3-datepicker-de@1.7.1
+rajit:bootstrap3-datepicker-el@1.7.1
+rajit:bootstrap3-datepicker-en-au@1.7.1
+rajit:bootstrap3-datepicker-en-ca@1.7.1
+rajit:bootstrap3-datepicker-en-gb@1.7.1
+rajit:bootstrap3-datepicker-en-ie@1.7.1
+rajit:bootstrap3-datepicker-en-nz@1.7.1
+rajit:bootstrap3-datepicker-en-za@1.7.1
+rajit:bootstrap3-datepicker-eo@1.7.1
+rajit:bootstrap3-datepicker-es@1.7.1
+rajit:bootstrap3-datepicker-et@1.7.1
+rajit:bootstrap3-datepicker-eu@1.7.1
+rajit:bootstrap3-datepicker-fa@1.7.1
+rajit:bootstrap3-datepicker-fi@1.7.1
+rajit:bootstrap3-datepicker-fo@1.7.1
+rajit:bootstrap3-datepicker-fr@1.7.1
+rajit:bootstrap3-datepicker-fr-ch@1.7.1
+rajit:bootstrap3-datepicker-gl@1.7.1
+rajit:bootstrap3-datepicker-he@1.7.1
+rajit:bootstrap3-datepicker-hi@1.7.1
+rajit:bootstrap3-datepicker-hr@1.7.1
+rajit:bootstrap3-datepicker-hu@1.7.1
+rajit:bootstrap3-datepicker-hy@1.7.1
+rajit:bootstrap3-datepicker-id@1.7.1
+rajit:bootstrap3-datepicker-is@1.7.1
+rajit:bootstrap3-datepicker-it@1.7.1
+rajit:bootstrap3-datepicker-it-ch@1.7.1
+rajit:bootstrap3-datepicker-ja@1.7.1
+rajit:bootstrap3-datepicker-ka@1.7.1
+rajit:bootstrap3-datepicker-kh@1.7.1
+rajit:bootstrap3-datepicker-kk@1.7.1
+rajit:bootstrap3-datepicker-km@1.7.1
+rajit:bootstrap3-datepicker-ko@1.7.1
+rajit:bootstrap3-datepicker-kr@1.7.1
+rajit:bootstrap3-datepicker-lv@1.7.1
+rajit:bootstrap3-datepicker-me@1.7.1
+rajit:bootstrap3-datepicker-mk@1.7.1
+rajit:bootstrap3-datepicker-mn@1.7.1
+rajit:bootstrap3-datepicker-ms@1.7.1
+rajit:bootstrap3-datepicker-nb@1.7.1
+rajit:bootstrap3-datepicker-nl@1.7.1
+rajit:bootstrap3-datepicker-nl-be@1.7.1
+rajit:bootstrap3-datepicker-no@1.7.1
+rajit:bootstrap3-datepicker-oc@1.7.1
+rajit:bootstrap3-datepicker-pl@1.7.1
+rajit:bootstrap3-datepicker-pt@1.7.1
+rajit:bootstrap3-datepicker-pt-br@1.7.1
+rajit:bootstrap3-datepicker-ro@1.7.1
+rajit:bootstrap3-datepicker-rs@1.7.1
+rajit:bootstrap3-datepicker-rs-latin@1.7.1
+rajit:bootstrap3-datepicker-ru@1.7.1
+rajit:bootstrap3-datepicker-sk@1.7.1
+rajit:bootstrap3-datepicker-sl@1.7.1
+rajit:bootstrap3-datepicker-sq@1.7.1
+rajit:bootstrap3-datepicker-sr@1.7.1
+rajit:bootstrap3-datepicker-sr-latin@1.7.1
+rajit:bootstrap3-datepicker-sv@1.7.1
+rajit:bootstrap3-datepicker-sw@1.7.1
+rajit:bootstrap3-datepicker-ta@1.7.1
+rajit:bootstrap3-datepicker-tg@1.7.1
+rajit:bootstrap3-datepicker-th@1.7.1
+rajit:bootstrap3-datepicker-tr@1.7.1
+rajit:bootstrap3-datepicker-uk@1.7.1
+rajit:bootstrap3-datepicker-uz-cyrl@1.7.1
+rajit:bootstrap3-datepicker-uz-latn@1.7.1
+rajit:bootstrap3-datepicker-vi@1.7.1
+rajit:bootstrap3-datepicker-zh-cn@1.7.1
+rajit:bootstrap3-datepicker-zh-tw@1.7.1
 random@1.2.1
 rate-limit@1.1.1
 react-fast-refresh@0.2.7
@@ -18,13 +18,131 @@ Note:

 [How to upgrade WeKan](https://github.com/wekan/wekan/issues/4585)

-# Upcoming v7.00 WeKan ® release
+# v7.01 2023-07-21 WeKan ® release

-This version number and and some before it is reserved for upcoming PR from mfilser.
+This release fixes the following bugs:
+
+- [Fix for Calendar View Create Card](https://github.com/wekan/wekan/pull/5019).
+  Thanks to DimDz.
+- [Minicard didn't show the assignee](https://github.com/wekan/wekan/pull/5021).
+  Thanks to mfilser.
+- [Helm Chart: Add imagePullPolicy to initContainer. Needed for running wekan when restarting while offline](https://github.com/wekan/charts/pull/21).
+  Thanks to jadams.
+- [Removing Utils.getCurrentSetting() and use ReactiveCache directly](https://github.com/wekan/wekan/pull/5022).
+  Thanks to mfilser.
+- [Attachment rename and delete works now again for non board admins](https://github.com/wekan/wekan/pull/5023).
+  Thanks to mfilser.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v7.00 2023-07-19 WeKan ® release

 This release adds the following new features:

- Speed improvements to Board and List loading.
+- [Speed improvements to Board and List loading](https://github.com/wekan/wekan/pull/5014).
+  Thanks to mfilser.
+
+and adds the following updates:
+
+- [Forked meteor-globals and meteor-reactive-cache to @wekanteam/meteor-globals and @wekanteam/meteor-reactive-cache to update to newest dependencies](https://github.com/wekan/wekan/commit/1c5857f0646658b121d7612b6176ec5e09c68592).
+  Thanks to xet7.
+
+and fixes the following bugs:
+
+- [Added missing @babel/runtime](https://github.com/wekan/wekan/commit/60cb5fb0176ecb623d494613aab196f252c16752).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v6.99.9 2023-07-18 WeKan ® release
+
+This release fixes the following bugs:
+
+- [Fix "PROPAGATE_OIDC_DATA" mechanism if "info.groups" is undefined](https://github.com/wekan/wekan/pull/5011).
+  Thanks to NotTheEvilOne.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v6.99.8 2023-07-13 WeKan ® release
+
+This release fixes the following bugs:
+
+- [Fix card creation. Now date fields are checked if they are empty](https://github.com/wekan/wekan/pull/5009).
+  Thanks to helioguardabaxo.
+- [Helm Chart: Changes for Openshift](https://github.com/wekan/charts/pull/20).
+  Thanks to salleman33.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v6.99.7 2023-07-11 WeKan ® release
+
+This release adds the following updates:
+
+- [Updated dependencies](https://github.com/wekan/wekan/pull/5008).
+  Thanks to dependabot.
+
+and fixes the following bugs:
+
+- [Fix setting background image](https://github.com/wekan/wekan/pull/5004).
+  Thanks to VidVidex.
+- [Added missing character](https://github.com/wekan/wekan/commit/4431ec5a2761d56685d2fca1202679b9bdcd9b81).
+  Thanks to xet7.
+- [Added back datepicker](https://github.com/wekan/wekan/commit/912479baa48354a68bc807737a3db7975a4cb95c).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v6.99.5 2023-07-10 WeKan ® release
+
+This release fixes the following bugs:
+
+- [Reverted bold of minicard title](https://github.com/wekan/wekan/commit/c7dc912dd4403845a123d9202e930c886788db5b).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v6.99.4 2023-07-10 WeKan ® release
+
+This release fixes the following bugs:
+
+- [Disable migration attachment-cardCopy-fix-boardId-etc. Part 3](https://github.com/wekan/wekan/commit/34fef627a1c02700650fa97fb0fd1d3a36d79776).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v6.99.3 2023-07-10 WeKan ® release
+
+This release fixes the following bugs:
+
+- [Fix migration attachment-cardCopy-fix-boardId-etc. Part 2](https://github.com/wekan/wekan/commit/8555c24eb21134eda9b4d71494676b39d126ef35).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v6.99.2 2023-07-10 WeKan ® release
+
+This release adds the following updates:
+
+- [Updated dependencies](https://github.com/wekan/wekan/pull/5001).
+  Thanks to dependabot.
+
+and fixes the following bugs:
+
+- [Added back npm packages: fibers and @mapbox/node-pre-gyp](https://github.com/wekan/wekan/commit/8bf40e219a9fa55b8f2ef19dbf6acc58d646b968).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v6.99.1 2023-07-10 WeKan ® release
+
+This release adds the following updates:
+
+- [Updated dependencies](https://github.com/wekan/wekan/commit/95d3e5cdc6136a9778bf7c84812a6d62ef6d4044).
+  Thanks to developers of dependencies.
+
+and fixes the following bugs:
+
+- [Fix for migration "attachment-cardCopy-fix-boardId-etc"](https://github.com/wekan/wekan/pull/4999).
  Thanks to mfilser.

 Thanks to above GitHub users for their contributions and translators for their translations.
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v6.99.0"
+appVersion: "v7.01.0"
 files:
  userUploads:
    - README.md
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import DOMPurify from 'dompurify';
 import { TAPi18n } from '/imports/i18n';

@@ -24,7 +25,7 @@ BlazeComponent.extendComponent({
        searchId = Session.get(`current${capitalizedMode}`);
      }
      const limit = this.page.get() * activitiesPerPage;
-      const user = Meteor.user();
+      const user = ReactiveCache.getCurrentUser();
      const hideSystem = user ? user.hasHiddenSystemMessages() : false;
      if (searchId === null) return;

@@ -65,7 +66,7 @@ Template.activities.helpers({
 BlazeComponent.extendComponent({
  checkItem() {
    const checkItemId = this.currentData().activity.checklistItemId;
-    const checkItem = ChecklistItems.findOne({ _id: checkItemId });
+    const checkItem = ReactiveCache.getChecklistItem(checkItemId);
    return checkItem && checkItem.title;
  },

@@ -145,7 +146,7 @@ BlazeComponent.extendComponent({
  lastLabel() {
    const lastLabelId = this.currentData().activity.labelId;
    if (!lastLabelId) return null;
-    const lastLabel = Boards.findOne(
+    const lastLabel = ReactiveCache.getBoard(
      this.currentData().activity.boardId,
    ).getLabelById(lastLabelId);
    if (lastLabel && (lastLabel.name === undefined || lastLabel.name === '')) {
@@ -158,7 +159,7 @@ BlazeComponent.extendComponent({
  },

  lastCustomField() {
-    const lastCustomField = CustomFields.findOne(
+    const lastCustomField = ReactiveCache.getCustomField(
      this.currentData().activity.customFieldId,
    );
    if (!lastCustomField) return null;
@@ -166,7 +167,7 @@ BlazeComponent.extendComponent({
  },

  lastCustomFieldValue() {
-    const lastCustomField = CustomFields.findOne(
+    const lastCustomField = ReactiveCache.getCustomField(
      this.currentData().activity.customFieldId,
    );
    if (!lastCustomField) return null;
@@ -282,10 +283,10 @@ Template.activity.helpers({

 Template.commentReactions.events({
  'click .reaction'(event) {
-    if (Meteor.user().isBoardMember()) {
+    if (ReactiveCache.getCurrentUser().isBoardMember()) {
      const codepoint = event.currentTarget.dataset['codepoint'];
      const commentId = Template.instance().data.commentId;
-      const cardComment = CardComments.findOne({_id: commentId});
+      const cardComment = ReactiveCache.getCardComment(commentId);
      cardComment.toggleReaction(codepoint);
    }
  },
@@ -294,10 +295,10 @@ Template.commentReactions.events({

 Template.addReactionPopup.events({
  'click .add-comment-reaction'(event) {
-    if (Meteor.user().isBoardMember()) {
+    if (ReactiveCache.getCurrentUser().isBoardMember()) {
      const codepoint = event.currentTarget.dataset['codepoint'];
      const commentId = Template.instance().data.commentId;
-      const cardComment = CardComments.findOne({_id: commentId});
+      const cardComment = ReactiveCache.getCardComment(commentId);
      cardComment.toggleReaction(codepoint);
    }
    Popup.back();
@@ -325,12 +326,13 @@ Template.addReactionPopup.helpers({

 Template.commentReactions.helpers({
  isSelected(userIds) {
-    return userIds.includes(Meteor.user()._id);
+    return Meteor.userId() && userIds.includes(Meteor.userId());
  },
  userNames(userIds) {
-    return Users.find({_id: {$in: userIds}})
-                .map(user => user.profile.fullname)
-                .join(', ');
+    const ret = ReactiveCache.getUsers({_id: {$in: userIds}})
+      .map(user => user.profile.fullname)
+      .join(', ');
+    return ret;
  }
 })

@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 const commentFormIsOpen = new ReactiveVar(false);

 BlazeComponent.extendComponent({
@@ -24,7 +26,7 @@ BlazeComponent.extendComponent({
          let boardId = card.boardId;
          let cardId = card._id;
          if (card.isLinkedCard()) {
-            boardId = Cards.findOne(card.linkedId).boardId;
+            boardId = ReactiveCache.getCard(card.linkedId).boardId;
            cardId = card.linkedId;
          } else if (card.isLinkedBoard()) {
            boardId = card.linkedId;
@@ -1,19 +1,22 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.subscribe('archivedBoards');
  },

  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },

  archivedBoards() {
-    return Boards.find(
+    const ret = ReactiveCache.getBoards(
      { archived: true },
      {
        sort: { archivedAt: -1, modifiedAt: -1 },
      },
    );
+    return ret;
  },

  events() {
@@ -25,8 +28,8 @@ BlazeComponent.extendComponent({
            Meteor.settings &&
            Meteor.settings.public &&
            Meteor.settings.public.sandstorm;
-          if (isSandstorm && Session.get('currentBoard')) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          if (isSandstorm && Utils.getCurrentBoardId()) {
+            const currentBoard = Utils.getCurrentBoard();
            currentBoard.archive();
          }
          const board = this.currentData();
@@ -39,8 +42,8 @@ BlazeComponent.extendComponent({
            Meteor.settings &&
            Meteor.settings.public &&
            Meteor.settings.public.sandstorm;
-          if (isSandstorm && Session.get('currentBoard')) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          if (isSandstorm && Utils.getCurrentBoardId()) {
+            const currentBoard = Utils.getCurrentBoard();
            Boards.remove(currentBoard._id);
          }
          Boards.remove(this._id);
@@ -168,11 +168,28 @@
  color: #fff !important;
 }
 /* Modal Styles */
+.modal {
+  display: none;
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 9999;
+  background-color: rgba(0, 0, 0, 0.5);
+  width: 100%;
+  height: 100%;
+}
 .modal-dialog {
  display: flex;
  justify-content: center;
  align-items: center;
-  height: 70%;
+  height: 25%; /* Adjust the height to make it smaller */
+  position: relative;
+  margin: 10% auto; /* This margin will help center the modal vertically */
+  max-width: 400px; /* Adjust the max-width to make it smaller */
+  background-color: #fff;
+  border-radius: 5px;
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.3);
 }
 .modal-header {
  display: flex;
@@ -203,4 +220,5 @@
  top: 5px;
  right: 5px;
  font-size: 25px;
+  cursor: pointer;
 }
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 const subManager = new SubsManager();
@@ -43,9 +44,9 @@ BlazeComponent.extendComponent({
    this.mouseHasEnterCardDetails = false;

    // fix swimlanes sort field if there are null values
-    const currentBoardData = Boards.findOne(Session.get('currentBoard'));
+    const currentBoardData = Utils.getCurrentBoard();
    const nullSortSwimlanes = currentBoardData.nullSortSwimlanes();
-    if (nullSortSwimlanes.count() > 0) {
+    if (nullSortSwimlanes.length > 0) {
      const swimlanes = currentBoardData.swimlanes();
      let count = 0;
      swimlanes.forEach(s => {
@@ -60,7 +61,7 @@ BlazeComponent.extendComponent({

    // fix lists sort field if there are null values
    const nullSortLists = currentBoardData.nullSortLists();
-    if (nullSortLists.count() > 0) {
+    if (nullSortLists.length > 0) {
      const lists = currentBoardData.lists();
      let count = 0;
      lists.forEach(l => {
@@ -204,25 +205,26 @@ BlazeComponent.extendComponent({
      }

      // Disable drag-dropping if the current user is not a board member
-      //$swimlanesDom.sortable('option', 'disabled', !userIsMember());
      $swimlanesDom.sortable(
        'option',
        'disabled',
-        !Meteor.user() || !Meteor.user().isBoardAdmin(),
+        !ReactiveCache.getCurrentUser()?.isBoardAdmin(),
      );
    });

    // If there is no data in the board (ie, no lists) we autofocus the list
    // creation form by clicking on the corresponding element.
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
-    if (Utils.canModifyBoard() && currentBoard.lists().count() === 0) {
+    const currentBoard = Utils.getCurrentBoard();
+    if (Utils.canModifyBoard() && currentBoard.lists().length === 0) {
      boardComponent.openNewListForm();
    }
+
+    Utils.setBackgroundImage();
  },

  notDisplayThisBoard() {
    let allowPrivateVisibilityOnly = TableVisibilityModeSettings.findOne('tableVisibilityMode-allowPrivateOnly');
-    let currentBoard = Boards.findOne(Session.get('currentBoard'));
+    let currentBoard = Utils.getCurrentBoard();
    if (allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue && currentBoard.permission == 'public') {
      return true;
    }
@@ -231,7 +233,7 @@ BlazeComponent.extendComponent({
  },

  isViewSwimlanes() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).boardView === 'board-view-swimlanes';
    } else {
@@ -242,7 +244,7 @@ BlazeComponent.extendComponent({
  },

  isViewLists() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).boardView === 'board-view-lists';
    } else {
@@ -251,7 +253,7 @@ BlazeComponent.extendComponent({
  },

  isViewCalendar() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).boardView === 'board-view-cal';
    } else {
@@ -342,7 +344,7 @@ BlazeComponent.extendComponent({
      },
      locale: TAPi18n.getLanguage(),
      events(start, end, timezone, callback) {
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const currentBoard = Utils.getCurrentBoard();
        const events = [];
        const pushEvent = function (card, title, start, end, extraCls) {
          start = start || card.startAt;
@@ -388,7 +390,7 @@ BlazeComponent.extendComponent({
      },
      eventResize(event, delta, revertFunc) {
        let isOk = false;
-        const card = Cards.findOne(event.id);
+        const card = ReactiveCache.getCard(event.id);

        if (card) {
          card.setEnd(event.end.toDate());
@@ -400,7 +402,7 @@ BlazeComponent.extendComponent({
      },
      eventDrop(event, delta, revertFunc) {
        let isOk = false;
-        const card = Cards.findOne(event.id);
+        const card = ReactiveCache.getCard(event.id);
        if (card) {
          // TODO: add a flag for allDay events
          if (!event.allDay) {
@@ -415,35 +417,37 @@ BlazeComponent.extendComponent({
          revertFunc();
        }
      },
-      select: function(startDate) {
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
-        const currentUser = Meteor.user();
-        const $modal = $(`
-          <div class="modal fade" tabindex="-1" role="dialog">
-            <div class="modal-dialog justify-content-center align-items-center" role="document">
-              <div class="modal-content">
-                <div class="modal-header">
-                  <h5 class="modal-title">${TAPi18n.__('r-create-card')}</h5>
-                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                  </button>
-                </div>
-                <div class="modal-body text-center">
-                  <input type="text" class="form-control" id="card-title-input" placeholder="">
-                </div>
-                <div class="modal-footer">
-                  <button type="button" class="btn btn-primary" id="create-card-button">${TAPi18n.__('add-card')}</button>
-                </div>
-              </div>
+      select: function (startDate) {
+        const currentBoard = Utils.getCurrentBoard();
+        const currentUser = ReactiveCache.getCurrentUser();
+        const modalElement = document.createElement('div');
+        modalElement.classList.add('modal', 'fade');
+        modalElement.setAttribute('tabindex', '-1');
+        modalElement.setAttribute('role', 'dialog');
+        modalElement.innerHTML = `
+        <div class="modal-dialog justify-content-center align-items-center" role="document">
+          <div class="modal-content">
+            <div class="modal-header">
+              <h5 class="modal-title">${TAPi18n.__('r-create-card')}</h5>
+              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+              </button>
+            </div>
+            <div class="modal-body text-center">
+              <input type="text" class="form-control" id="card-title-input" placeholder="">
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-primary" id="create-card-button">${TAPi18n.__('add-card')}</button>
            </div>
          </div>
-        `);
-        $modal.modal('show');
-        $modal.find('#create-card-button').click(function() {
-          const myTitle = $modal.find('#card-title-input').val();
+        </div>
+        `;
+        const createCardButton = modalElement.querySelector('#create-card-button');
+        createCardButton.addEventListener('click', function () {
+          const myTitle = modalElement.querySelector('#card-title-input').value;
          if (myTitle) {
-            const firstList = currentBoard.draggableLists().fetch()[0];
-            const firstSwimlane = currentBoard.swimlanes().fetch()[0];
+            const firstList = currentBoard.draggableLists()[0];
+            const firstSwimlane = currentBoard.swimlanes()[0];
            Meteor.call('createCardWithDueDate', currentBoard._id, firstList._id, myTitle, startDate.toDate(), firstSwimlane._id, function(error, result) {
              if (error) {
                console.log(error);
@@ -451,14 +455,24 @@ BlazeComponent.extendComponent({
                console.log("Card Created", result);
              }
            });
-            $modal.modal('hide');
+            closeModal();
          }
        });
-      },
+        document.body.appendChild(modalElement);
+        const openModal = function() {
+          modalElement.style.display = 'flex';
+        };
+        const closeModal = function() {
+          modalElement.style.display = 'none';
+        };
+        const closeButton = modalElement.querySelector('[data-dismiss="modal"]');
+        closeButton.addEventListener('click', closeModal);
+        openModal();
+      }
    };
  },
  isViewCalendar() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).boardView === 'board-view-cal';
    } else {
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 /*
@@ -18,14 +19,14 @@ Template.boardMenuPopup.events({
  'click .js-change-board-color': Popup.open('boardChangeColor'),
  'click .js-change-language': Popup.open('changeLanguage'),
  'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    currentBoard.archive();
    // XXX We should have some kind of notification on top of the page to
    // confirm that the board was successfully archived.
    FlowRouter.go('home');
  }),
  'click .js-delete-board': Popup.afterConfirm('deleteBoard', function() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    Popup.back();
    Boards.remove(currentBoard._id);
    FlowRouter.go('home');
@@ -58,24 +59,24 @@ Template.boardChangeTitlePopup.events({

 BlazeComponent.extendComponent({
  watchLevel() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return currentBoard && currentBoard.getWatchLevel(Meteor.userId());
  },

  isStarred() {
    const boardId = Session.get('currentBoard');
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    return user && user.hasStarred(boardId);
  },

  // Only show the star counter if the number of star is greater than 2
  showStarCounter() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return currentBoard && currentBoard.stars >= 2;
  },
  /*
  showSort() {
-    return Meteor.user().hasSortBy();
+    return ReactiveCache.getCurrentUser().hasSortBy();
  },
  directionClass() {
    return this.currentDirection() === -1 ? DOWNCLS : UPCLS;
@@ -85,10 +86,10 @@ BlazeComponent.extendComponent({
    Meteor.call('setListSortBy', direction + this.currentListSortBy());
  },
  currentDirection() {
-    return Meteor.user().getListSortByDirection();
+    return ReactiveCache.getCurrentUser().getListSortByDirection();
  },
  currentListSortBy() {
-    return Meteor.user().getListSortBy();
+    return ReactiveCache.getCurrentUser().getListSortBy();
  },
  listSortShortDesc() {
    return `list-label-short-${this.currentListSortBy()}`;
@@ -99,7 +100,7 @@ BlazeComponent.extendComponent({
      {
        'click .js-edit-board-title': Popup.open('boardChangeTitle'),
        'click .js-star-board'() {
-          Meteor.user().toggleBoardStar(Session.get('currentBoard'));
+          ReactiveCache.getCurrentUser().toggleBoardStar(Session.get('currentBoard'));
        },
        'click .js-open-board-menu': Popup.open('boardMenu'),
        'click .js-change-visibility': Popup.open('boardChangeVisibility'),
@@ -306,7 +307,7 @@ const CreateBoard = BlazeComponent.extendComponent({
  onSubmit(event) {
    super.onSubmit(event);
    // Immediately star boards crated with the headerbar popup.
-    Meteor.user().toggleBoardStar(this.boardId.get());
+    ReactiveCache.getCurrentUser().toggleBoardStar(this.boardId.get());
  }
 }.register('headerBarCreateBoardPopup'));

@@ -315,12 +316,12 @@ BlazeComponent.extendComponent({
    return !TableVisibilityModeSettings.findOne('tableVisibilityMode-allowPrivateOnly').booleanValue;
  },
  visibilityCheck() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return this.currentData() === currentBoard.permission;
  },

  selectBoardVisibility() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    const visibility = this.currentData();
    currentBoard.setVisibility(visibility);
    Popup.back();
@@ -337,7 +338,7 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  watchLevel() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return currentBoard.getWatchLevel(Meteor.userId());
  },

@@ -377,7 +378,7 @@ BlazeComponent.extendComponent({
  allowedSortValues() {
    const types = [];
    const pushed = {};
-    Meteor.user()
+    ReactiveCache.getCurrentUser()
      .getListSortTypes()
      .forEach(type => {
        const key = type.replace(/^-/, '');
@@ -393,16 +394,16 @@ BlazeComponent.extendComponent({
    return types;
  },
  Direction() {
-    return Meteor.user().getListSortByDirection() === -1
+    return ReactiveCache.getCurrentUser().getListSortByDirection() === -1
      ? this.downClass
      : this.upClass;
  },
  sortby() {
-    return Meteor.user().getListSortBy();
+    return ReactiveCache.getCurrentUser().getListSortBy();
  },

  setSortBy(type = null) {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    if (type === null) {
      type = user._getListSortBy();
    } else {
@@ -1,11 +1,9 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 const subManager = new SubsManager();

 Template.boardList.helpers({
-  currentSetting() {
-    return Settings.findOne();
-  },
  hideCardCounterList() {
    /* Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
       return Utils.isMiniScreen() && Session.get('currentBoard'); */
@@ -33,10 +31,10 @@ Template.boardListHeaderBar.helpers({
    //}
  },
  templatesBoardId() {
-    return Meteor.user() && Meteor.user().getTemplatesBoardId();
+    return ReactiveCache.getCurrentUser()?.getTemplatesBoardId();
  },
  templatesBoardSlug() {
-    return Meteor.user() && Meteor.user().getTemplatesBoardSlug();
+    return ReactiveCache.getCurrentUser()?.getTemplatesBoardSlug();
  },
 });

@@ -44,7 +42,7 @@ BlazeComponent.extendComponent({
  onCreated() {
    Meteor.subscribe('setting');
    Meteor.subscribe('tableVisibilityModeSettings');
-    let currUser = Meteor.user();
+    let currUser = ReactiveCache.getCurrentUser();
    let userLanguage;
    if (currUser && currUser.profile) {
      userLanguage = currUser.profile.language
@@ -102,51 +100,34 @@ BlazeComponent.extendComponent({
    });
  },
  userHasTeams() {
-    if (Meteor.user() != null && Meteor.user().teams && Meteor.user().teams.length > 0)
+    if (ReactiveCache.getCurrentUser()?.teams?.length > 0)
      return true;
    else
      return false;
  },
  teamsDatas() {
-    if (Meteor.user().teams)
-      return Meteor.user().teams.sort((a, b) => a.teamDisplayName.localeCompare(b.teamDisplayName));
+    const teams = ReactiveCache.getCurrentUser()?.teams
+    if (teams)
+      return teams.sort((a, b) => a.teamDisplayName.localeCompare(b.teamDisplayName));
    else
      return [];
  },
  userHasOrgs() {
-    if (Meteor.user() != null && Meteor.user().orgs && Meteor.user().orgs.length > 0)
+    if (ReactiveCache.getCurrentUser()?.orgs?.length > 0)
      return true;
    else
      return false;
  },
-  /*
-    userHasTemplates(){
-      if(Meteor.user() != null && Meteor.user().orgs && Meteor.user().orgs.length > 0)
-        return true;
-      else
-        return false;
-    },
-  */
  orgsDatas() {
-    if (Meteor.user().orgs)
-      return Meteor.user().orgs.sort((a, b) => a.orgDisplayName.localeCompare(b.orgDisplayName));
+    const orgs = ReactiveCache.getCurrentUser()?.orgs;
+    if (orgs)
+      return orgs.sort((a, b) => a.orgDisplayName.localeCompare(b.orgDisplayName));
    else
      return [];
  },
  userHasOrgsOrTeams() {
-    let boolUserHasOrgs;
-    if (Meteor.user() != null && Meteor.user().orgs && Meteor.user().orgs.length > 0)
-      boolUserHasOrgs = true;
-    else
-      boolUserHasOrgs = false;
-
-    let boolUserHasTeams;
-    if (Meteor.user() != null && Meteor.user().teams && Meteor.user().teams.length > 0)
-      boolUserHasTeams = true;
-    else
-      boolUserHasTeams = false;
-
-    return (boolUserHasOrgs || boolUserHasTeams);
+    const ret = this.userHasOrgs() || this.userHasTeams();
+    return ret;
  },
  boards() {
    let query = {
@@ -168,14 +149,7 @@ BlazeComponent.extendComponent({
      if (allowPrivateVisibilityOnly !== undefined && allowPrivateVisibilityOnly.booleanValue) {
        query.$and.push({ 'permission': 'private' });
      }
-      const currUser = Users.findOne(Meteor.userId());
-
-      // const currUser = Users.findOne(Meteor.userId(), {
-      //   fields: {
-      //     orgs: 1,
-      //     teams: 1,
-      //   },
-      // });
+      const currUser = ReactiveCache.getCurrentUser();

      let orgIdsUserBelongs = currUser !== undefined && currUser.teams !== 'undefined' ? currUser.orgIdsUserBelongs() : '';
      if (orgIdsUserBelongs && orgIdsUserBelongs != '') {
@@ -207,27 +181,28 @@ BlazeComponent.extendComponent({
      };
    }

-    return Boards.find(query, {
+    const ret = ReactiveCache.getBoards(query, {
      sort: { sort: 1 /* boards default sorting */ },
    });
+    return ret;
  },
  boardLists(boardId) {
-    let boardLists = [];
-    const lists = Lists.find({ 'boardId': boardId, 'archived': false },{sort: ['sort','asc']});
    /* Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
-    lists.forEach(list => {
-      let cardCount = Cards.find({ 'boardId': boardId, 'listId': list._id }).count()
-      boardLists.push(`${list.title}: ${cardCount}`);
+    const lists = ReactiveCache.getLists({ 'boardId': boardId, 'archived': false },{sort: ['sort','asc']});
+    const ret = lists.map(list => {
+      let cardCount = ReactiveCache.getCards({ 'boardId': boardId, 'listId': list._id }).length;
+      return `${list.title}: ${cardCount}`;
    });
+    return ret;
    */
-    return boardLists;
+    return [];
  },

  boardMembers(boardId) {
    let boardMembers = [];
    /* Bug Board icons random dance https://github.com/wekan/wekan/issues/4214
-    const lists = Boards.findOne({ '_id': boardId })
-    let members = lists.members;
+    const lists = ReactiveCache.getBoard(boardId)
+    let members = lists.members
    members.forEach(member => {
      boardMembers.push(member.userId);
    });
@@ -236,26 +211,24 @@ BlazeComponent.extendComponent({
  },

  isStarred() {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    return user && user.hasStarred(this.currentData()._id);
  },
  isAdministrable() {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    return user && user.isBoardAdmin(this.currentData()._id);
  },

  hasOvertimeCards() {
-    subManager.subscribe('board', this.currentData()._id, false);
    return this.currentData().hasOvertimeCards();
  },

  hasSpentTimeCards() {
-    subManager.subscribe('board', this.currentData()._id, false);
    return this.currentData().hasSpentTimeCards();
  },

  isInvited() {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    return user && user.isInvitedTo(this.currentData()._id);
  },

@@ -265,18 +238,18 @@ BlazeComponent.extendComponent({
        'click .js-add-board': Popup.open('createBoard'),
        'click .js-star-board'(evt) {
          const boardId = this.currentData()._id;
-          Meteor.user().toggleBoardStar(boardId);
+          ReactiveCache.getCurrentUser().toggleBoardStar(boardId);
          evt.preventDefault();
        },
        'click .js-clone-board'(evt) {
-          let title = getSlug(Boards.findOne(this.currentData()._id).title) || 'cloned-board';
+          let title = getSlug(ReactiveCache.getBoard(this.currentData()._id).title) || 'cloned-board';
          Meteor.call(
            'copyBoard',
            this.currentData()._id,
            {
-              sort: Boards.find({ archived: false }).count(),
+              sort: ReactiveCache.getBoards({ archived: false }).length,
              type: 'board',
-              title: Boards.findOne(this.currentData()._id).title,
+              title: ReactiveCache.getBoard(this.currentData()._id).title,
            },
            (err, res) => {
              if (err) {
@@ -350,7 +323,7 @@ BlazeComponent.extendComponent({
              query.$and[2].$or.push({ 'orgs.orgId': { $in: selectedOrgsValues } });
            }

-            let filteredBoards = Boards.find(query, {}).fetch();
+            let filteredBoards = ReactiveCache.getBoards(query, {});
            let allBoards = document.getElementsByClassName("js-board");
            let currBoard;
            if (filteredBoards.length > 0) {
@@ -87,15 +87,14 @@ template(name="attachmentGallery")
            .attachment-actions
              a.js-download(href="{{link}}?download=true", download="{{name}}")
                i.fa.fa-download.icon(title="{{_ 'download'}}")
-              if currentUser.isBoardAdmin
-                a.js-rename
-                  i.fa.fa-pencil-square-o.icon(title="{{_ 'rename'}}")
-                a.js-confirm-delete
-                  i.fa.fa-trash.icon(title="{{_ 'delete'}}")
              if currentUser.isBoardMember
                unless currentUser.isCommentOnly
                  unless currentUser.isWorker
-                    a.fa.fa-navicon.icon.js-open-attachment-menu(title="{{_ 'attachmentActionsPopup-title'}}")
+                    a.js-rename
+                      i.fa.fa-pencil-square-o.icon(title="{{_ 'rename'}}")
+                    a.js-confirm-delete
+                      i.fa.fa-trash.icon(title="{{_ 'delete'}}")
+                    a.fa.fa-navicon.icon.js-open-attachment-menu(data-attachment-link="{{link}}" title="{{_ 'attachmentActionsPopup-title'}}")


 template(name="attachmentActionsPopup")
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { ObjectID } from 'bson';
 import DOMPurify from 'dompurify';

@@ -10,6 +11,10 @@ const prettyMilliseconds = require('pretty-ms');
 let cardId = null;
 let openAttachmentId = null;

+
+// Stores link to the attachment for which attachment actions popup was opened
+attachmentActionsLink = null;
+
 Template.attachmentGallery.events({
  'click .open-preview'(event) {

@@ -25,6 +30,9 @@ Template.attachmentGallery.events({
    event.stopPropagation();
  },
  'click .js-open-attachment-menu': Popup.open('attachmentActions'),
+  'mouseover .js-open-attachment-menu'(event) { // For some reason I cannot combine handlers for "click .js-open-attachment-menu" and "mouseover .js-open-attachment-menu" events so this is a quick workaround.
+    attachmentActionsLink = event.currentTarget.getAttribute("data-attachment-link");
+  },
  'click .js-rename': Popup.open('attachmentRename'),
  'click .js-confirm-delete': Popup.afterConfirm('attachmentDelete', function() {
    Attachments.remove(this._id);
@@ -33,7 +41,7 @@ Template.attachmentGallery.events({
 });

 function getNextAttachmentId(currentAttachmentId) {
-    const attachments = Attachments.find({'meta.cardId': cardId}).get();
+    const attachments = ReactiveCache.getAttachments({'meta.cardId': cardId});

    let i = 0;
    for (; i < attachments.length; i++) {
@@ -45,7 +53,7 @@ function getNextAttachmentId(currentAttachmentId) {
 }

 function getPrevAttachmentId(currentAttachmentId) {
-  const attachments = Attachments.find({'meta.cardId': cardId}).get();
+  const attachments = ReactiveCache.getAttachments({'meta.cardId': cardId});

  let i = 0;
  for (; i < attachments.length; i++) {
@@ -58,7 +66,7 @@ function getPrevAttachmentId(currentAttachmentId) {

 function openAttachmentViewer(attachmentId){

-    const attachment = Attachments.findOne({_id: attachmentId});
+    const attachment = ReactiveCache.getAttachment(attachmentId);

    $("#attachment-name").text(attachment.name);

@@ -159,7 +167,7 @@ Template.attachmentViewer.events({

 Template.attachmentGallery.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
  fileSize(size) {
    const ret = filesize(size);
@@ -315,11 +323,11 @@ Template.previewClipboardImagePopup.events({

 BlazeComponent.extendComponent({
  isCover() {
-    const ret = Cards.findOne(this.data().meta.cardId).coverId == this.data()._id;
+    const ret = ReactiveCache.getCard(this.data().meta.cardId).coverId == this.data()._id;
    return ret;
  },
  isBackgroundImage() {
-    //const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    //const currentBoard = Utils.getCurrentBoard();
    //return currentBoard.backgroundImageURL === $(".attachment-thumbnail-img").attr("src");
    return false;
  },
@@ -327,23 +335,22 @@ BlazeComponent.extendComponent({
    return [
      {
        'click .js-add-cover'() {
-          Cards.findOne(this.data().meta.cardId).setCover(this.data()._id);
+          ReactiveCache.getCard(this.data().meta.cardId).setCover(this.data()._id);
          Popup.back();
        },
        'click .js-remove-cover'() {
-          Cards.findOne(this.data().meta.cardId).unsetCover();
+          ReactiveCache.getCard(this.data().meta.cardId).unsetCover();
          Popup.back();
        },
        'click .js-add-background-image'() {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
-          const url=$(".attachment-thumbnail-img").attr("src");
-          currentBoard.setBackgroundImageURL(url);
-          Utils.setBackgroundImage(url);
+          const currentBoard = Utils.getCurrentBoard();
+          currentBoard.setBackgroundImageURL(attachmentActionsLink);
+          Utils.setBackgroundImage(attachmentActionsLink);
          Popup.back();
          event.preventDefault();
        },
        'click .js-remove-background-image'() {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
          currentBoard.setBackgroundImageURL("");
          Utils.setBackgroundImage("");
          Popup.back();
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import moment from 'moment/min/moment-with-locales';
 import { TAPi18n } from '/imports/i18n';
 import { DatePicker } from '/client/lib/datepicker';
@@ -63,16 +64,16 @@ BlazeComponent.extendComponent({
  },

  hiddenSystemMessages() {
-    return Meteor.user().hasHiddenSystemMessages();
+    return ReactiveCache.getCurrentUser().hasHiddenSystemMessages();
  },

  customFieldsGrid() {
-    return Meteor.user().hasCustomFieldsGrid();
+    return ReactiveCache.getCurrentUser().hasCustomFieldsGrid();
  },


  cardMaximized() {
-    return !Utils.getPopupCardId() && Meteor.user().hasCardMaximized();
+    return !Utils.getPopupCardId() && ReactiveCache.getCurrentUser().hasCardMaximized();
  },

  scrollParentContainer() {
@@ -143,7 +144,7 @@ BlazeComponent.extendComponent({
    const card = this.currentData();
    let result = '#';
    if (card) {
-      const board = Boards.findOne(card.boardId);
+      const board = ReactiveCache.getBoard(card.boardId);
      if (board) {
        result = FlowRouter.path('card', {
          boardId: card.boardId,
@@ -192,15 +193,15 @@ BlazeComponent.extendComponent({
        cardId: card._id,
        boardId: card.boardId,
        listId: card.listId,
-        user: Meteor.user().username,
+        user: ReactiveCache.getCurrentUser().username,
        url: '',
      };

-      const integrations = Integrations.find({
+      const integrations = ReactiveCache.getIntegrations({
        boardId: { $in: [card.boardId, Integrations.Const.GLOBAL_WEBHOOK_ID] },
        enabled: true,
        activities: { $in: ['CardDetailsRendered', 'all'] },
-      }).fetch();
+      });

      if (integrations.length > 0) {
        integrations.forEach((integration) => {
@@ -287,7 +288,7 @@ BlazeComponent.extendComponent({
    });

    function userIsMember() {
-      return Meteor.user() && Meteor.user().isBoardMember();
+      return ReactiveCache.getCurrentUser()?.isBoardMember();
    }

    // Disable sorting if the current user is not a board member
@@ -651,7 +652,7 @@ Template.cardDetailsActionsPopup.helpers({
  },

  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
 });

@@ -727,19 +728,8 @@ BlazeComponent.extendComponent({
 }).register('editCardTitleForm');

 Template.cardMembersPopup.onCreated(function () {
-  let currBoard = Boards.findOne(Session.get('currentBoard'));
+  let currBoard = Utils.getCurrentBoard();
  let members = currBoard.activeMembers();
-
-  // let query = {
-  //   "teams.teamId": { $in: currBoard.teams.map(t => t.teamId) },
-  // };
-
-  // let boardTeamUsers = Users.find(query, {
-  //   sort: { sort: 1 },
-  // });
-
-  // members = currBoard.activeMembers2(members, boardTeamUsers);
-
  this.members = new ReactiveVar(members);
 });

@@ -757,24 +747,14 @@ Template.cardMembersPopup.helpers({
 });

 const filterMembers = (filterTerm) => {
-  let currBoard = Boards.findOne(Session.get('currentBoard'));
+  let currBoard = Utils.getCurrentBoard();
  let members = currBoard.activeMembers();

-  // let query = {
-  //   "teams.teamId": { $in: currBoard.teams.map(t => t.teamId) },
-  // };
-
-  // let boardTeamUsers = Users.find(query, {
-  //   sort: { sort: 1 },
-  // });
-
-  // members = currBoard.activeMembers2(members, boardTeamUsers);
-
  if (filterTerm) {
    members = members
      .map(member => ({
        member,
-        user: Users.findOne(member.userId)
+        user: ReactiveCache.getUser(member.userId)
      }))
      .filter(({ user }) =>
        (user.profile.fullname !== undefined && user.profile.fullname.toLowerCase().indexOf(filterTerm.toLowerCase()) !== -1)
@@ -813,11 +793,11 @@ Template.editCardAssignerForm.events({
 /** Move Card Dialog */
 (class extends DialogWithBoardSwimlaneList {
  getDialogOptions() {
-    const ret = Meteor.user().getMoveAndCopyDialogOptions();
+    const ret = ReactiveCache.getCurrentUser().getMoveAndCopyDialogOptions();
    return ret;
  }
  setDone(boardId, swimlaneId, listId, options) {
-    Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    ReactiveCache.getCurrentUser().setMoveAndCopyDialogOption(this.currentBoardId, options);
    const card = this.data();
    const minOrder = card.getMinSort(listId, swimlaneId);
    card.move(boardId, swimlaneId, listId, minOrder - 1);
@@ -827,11 +807,11 @@ Template.editCardAssignerForm.events({
 /** Copy Card Dialog */
 (class extends DialogWithBoardSwimlaneList {
  getDialogOptions() {
-    const ret = Meteor.user().getMoveAndCopyDialogOptions();
+    const ret = ReactiveCache.getCurrentUser().getMoveAndCopyDialogOptions();
    return ret;
  }
  setDone(boardId, swimlaneId, listId, options) {
-    Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    ReactiveCache.getCurrentUser().setMoveAndCopyDialogOption(this.currentBoardId, options);
    const card = this.data();

    // const textarea = $('#copy-card-title');
@@ -854,11 +834,11 @@ Template.editCardAssignerForm.events({
 /** Convert Checklist-Item to card dialog */
 (class extends DialogWithBoardSwimlaneList {
  getDialogOptions() {
-    const ret = Meteor.user().getMoveAndCopyDialogOptions();
+    const ret = ReactiveCache.getCurrentUser().getMoveAndCopyDialogOptions();
    return ret;
  }
  setDone(boardId, swimlaneId, listId, options) {
-    Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    ReactiveCache.getCurrentUser().setMoveAndCopyDialogOption(this.currentBoardId, options);
    const card = this.data();

    const textarea = this.$('#copy-card-title');
@@ -872,7 +852,7 @@ Template.editCardAssignerForm.events({
        swimlaneId: swimlaneId,
        sort: 0,
      });
-      const card = Cards.findOne(_id);
+      const card = ReactiveCache.getCard(_id);
      const minOrder = card.getMinSort();
      card.move(card.boardId, card.swimlaneId, card.listId, minOrder - 1);

@@ -884,11 +864,11 @@ Template.editCardAssignerForm.events({
 /** Copy many cards dialog */
 (class extends DialogWithBoardSwimlaneList {
  getDialogOptions() {
-    const ret = Meteor.user().getMoveAndCopyDialogOptions();
+    const ret = ReactiveCache.getCurrentUser().getMoveAndCopyDialogOptions();
    return ret;
  }
  setDone(boardId, swimlaneId, listId, options) {
-    Meteor.user().setMoveAndCopyDialogOption(this.currentBoardId, options);
+    ReactiveCache.getCurrentUser().setMoveAndCopyDialogOption(this.currentBoardId, options);
    const card = this.data();

    const textarea = this.$('#copy-card-title');
@@ -960,27 +940,27 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    return Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
-        _id: {
-          $ne: Meteor.user().getTemplatesBoardId(),
-        },
+        _id: { $ne: ReactiveCache.getCurrentUser().getTemplatesBoardId() },
      },
      {
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
+    return ret;
  },

  cards() {
    const currentId = Utils.getCurrentCardId();
    if (this.parentBoard.get()) {
-      return Cards.find({
+      const ret = ReactiveCache.getCards({
        boardId: this.parentBoard.get(),
        _id: { $ne: currentId },
      });
+      return ret;
    } else {
      return [];
    }
@@ -1004,7 +984,7 @@ BlazeComponent.extendComponent({

  setParentCardId(cardId) {
    if (cardId) {
-      this.parentCard = Cards.findOne(cardId);
+      this.parentCard = ReactiveCache.getCard(cardId);
    } else {
      this.parentCard = null;
    }
@@ -1023,7 +1003,7 @@ BlazeComponent.extendComponent({
        'click .js-delete': Popup.afterConfirm('cardDelete', function () {
          Popup.close();
          // verify that there are no linked cards
-          if (Cards.find({ linkedId: this._id }).count() === 0) {
+          if (ReactiveCache.getCards({ linkedId: this._id }).length === 0) {
            Cards.remove(this._id);
          } else {
            // TODO: Maybe later we can list where the linked cards are.
@@ -1562,8 +1542,8 @@ EscapeActions.register(
  () => {
    // if card description diverges from database due to editing
    // ask user whether changes should be applied
-    if (Meteor.user()) {
-      if (Meteor.user().profile.rescueCardDescription == true) {
+    if (ReactiveCache.getCurrentUser()) {
+      if (ReactiveCache.getCurrentUser().profile.rescueCardDescription == true) {
        currentDescription = document.getElementsByClassName("editor js-new-description-input").item(0)
        if (currentDescription?.value && !(currentDescription.value === Utils.getCurrentCard().getDescription())) {
          if (confirm(TAPi18n.__('rescue-card-description-dialogue'))) {
@@ -1597,19 +1577,8 @@ EscapeActions.register(
 );

 Template.cardAssigneesPopup.onCreated(function () {
-  let currBoard = Boards.findOne(Session.get('currentBoard'));
+  let currBoard = Utils.getCurrentBoard();
  let members = currBoard.activeMembers();
-
-  // let query = {
-  //   "teams.teamId": { $in: currBoard.teams.map(t => t.teamId) },
-  // };
-
-  // let boardTeamUsers = Users.find(query, {
-  //   sort: { sort: 1 },
-  // });
-
-  // members = currBoard.activeMembers2(members, boardTeamUsers);
-
  this.members = new ReactiveVar(members);
 });

@@ -1639,13 +1608,13 @@ Template.cardAssigneesPopup.helpers({
  },

  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
 });

 Template.cardAssigneePopup.helpers({
  userData() {
-    return Users.findOne(this.userId, {
+    return ReactiveCache.getUser(this.userId, {
      fields: {
        profile: 1,
        username: 1,
@@ -1654,21 +1623,10 @@ Template.cardAssigneePopup.helpers({
  },

  memberType() {
-    const user = Users.findOne(this.userId);
+    const user = ReactiveCache.getUser(this.userId);
    return user && user.isBoardAdmin() ? 'admin' : 'normal';
  },

-  /*
-    presenceStatusClassName() {
-      const user = Users.findOne(this.userId);
-      const userPresence = presences.findOne({ userId: this.userId });
-      if (user && user.isInvitedTo(Session.get('currentBoard'))) return 'pending';
-      else if (!userPresence) return 'disconnected';
-      else if (Session.equals('currentBoard', userPresence.state.currentBoardId))
-        return 'active';
-      else return 'idle';
-    },
-  */
  isCardAssignee() {
    const card = Template.parentData();
    const cardAssignees = card.getAssignees();
@@ -1677,13 +1635,13 @@ Template.cardAssigneePopup.helpers({
  },

  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
 });

 Template.cardAssigneePopup.events({
  'click .js-remove-assignee'() {
-    Cards.findOne(this.cardId).unassignAssignee(this.userId);
+    ReactiveCache.getCard(this.cardId).unassignAssignee(this.userId);
    Popup.back();
  },
  'click .js-edit-profile': Popup.open('editProfile'),
@@ -92,7 +92,7 @@ template(name="editChecklistItemForm")
        | {{_ 'convertChecklistItemToCardPopup-title'}}

 template(name="checklistItems")
-  if checklist.items.count
+  if checklist.items.length
    if canModifyCard
      +inlinedForm(autoclose=false classNames="js-add-checklist-item" checklist = checklist position="top")
        +addChecklistItemForm(checklist=checklist showNewlineBecomesNewChecklistItem=true)
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import Cards from '/models/cards';
 import Boards from '/models/boards';
@@ -54,7 +55,7 @@ BlazeComponent.extendComponent({
    });

    function userIsMember() {
-      return Meteor.user() && Meteor.user().isBoardMember();
+      return ReactiveCache.getCurrentUser()?.isBoardMember();
    }

    // Disable sorting if the current user is not a board member
@@ -84,9 +85,11 @@ BlazeComponent.extendComponent({
    const textarea = this.find('textarea.js-add-checklist-item');
    const title = textarea.value.trim();
    let cardId = this.currentData().cardId;
-    const card = Cards.findOne(cardId);
+    const card = ReactiveCache.getCard(cardId);
    //if (card.isLinked()) cardId = card.linkedId;
-    if (card.isLinkedCard()) cardId = card.linkedId;
+    if (card.isLinkedCard()) {
+      cardId = card.linkedId;
+    }

    let sortIndex;
    let checklistItemIndex;
@@ -230,25 +233,26 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    return Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
-        _id: { $ne: Meteor.user().getTemplatesBoardId() },
+        _id: { $ne: ReactiveCache.getCurrentUser().getTemplatesBoardId() },
      },
      {
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
+    return ret;
  },

  swimlanes() {
-    const board = Boards.findOne(this.selectedBoardId.get());
+    const board = ReactiveCache.getBoard(this.selectedBoardId.get());
    return board.swimlanes();
  },

  aBoardLists() {
-    const board = Boards.findOne(this.selectedBoardId.get());
+    const board = ReactiveCache.getBoard(this.selectedBoardId.get());
    return board.lists();
  },

@@ -266,12 +270,12 @@ BlazeComponent.extendComponent({

 Template.checklists.helpers({
  checklists() {
-    const card = Cards.findOne(this.cardId);
+    const card = ReactiveCache.getCard(this.cardId);
    const ret = card.checklists();
    return ret;
  },
  hideCheckedItems() {
-    const currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) return currentUser.hasHideCheckedItems();
    return false;
  },
@@ -335,7 +339,7 @@ BlazeComponent.extendComponent({

 Template.checklistItemDetail.helpers({
  hideCheckedItems() {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    if (user) return user.hasHideCheckedItems();
    return false;
  },
@@ -361,11 +365,11 @@ BlazeComponent.extendComponent({
 /** Move Checklist Dialog */
 (class extends DialogWithBoardSwimlaneListCard {
  getDialogOptions() {
-    const ret = Meteor.user().getMoveChecklistDialogOptions();
+    const ret = ReactiveCache.getCurrentUser().getMoveChecklistDialogOptions();
    return ret;
  }
  setDone(cardId, options) {
-    Meteor.user().setMoveChecklistDialogOption(this.currentBoardId, options);
+    ReactiveCache.getCurrentUser().setMoveChecklistDialogOption(this.currentBoardId, options);
    this.data().checklist.move(cardId);
  }
 }).register('moveChecklistPopup');
@@ -373,11 +377,11 @@ BlazeComponent.extendComponent({
 /** Copy Checklist Dialog */
 (class extends DialogWithBoardSwimlaneListCard {
  getDialogOptions() {
-    const ret = Meteor.user().getCopyChecklistDialogOptions();
+    const ret = ReactiveCache.getCurrentUser().getCopyChecklistDialogOptions();
    return ret;
  }
  setDone(cardId, options) {
-    Meteor.user().setCopyChecklistDialogOption(this.currentBoardId, options);
+    ReactiveCache.getCurrentUser().setCopyChecklistDialogOption(this.currentBoardId, options);
    this.data().checklist.copy(cardId);
  }
 }).register('copyChecklistPopup');
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 let labelColors;
 Meteor.startup(() => {
  labelColors = Boards.simpleSchema()._schema['labels.$.color'].allowedValues;
@@ -32,7 +34,7 @@ Template.createLabelPopup.helpers({
  // is not already used in the board (although it's not a problem if two
  // labels have the same color).
  defaultColor() {
-    const labels = Boards.findOne(Session.get('currentBoard')).labels;
+    const labels = Utils.getCurrentBoard().labels;
    const usedColors = _.pluck(labels, 'color');
    const availableColors = _.difference(labelColors, usedColors);
    return availableColors.length > 1 ? availableColors[0] : labelColors[0];
@@ -117,7 +119,7 @@ Template.createLabelPopup.events({
  // Create the new label
  'submit .create-label'(event, templateInstance) {
    event.preventDefault();
-    const board = Boards.findOne(Session.get('currentBoard'));
+    const board = Utils.getCurrentBoard();
    const name = templateInstance
      .$('#labelName')
      .val()
@@ -130,13 +132,13 @@ Template.createLabelPopup.events({

 Template.editLabelPopup.events({
  'click .js-delete-label': Popup.afterConfirm('deleteLabel', function () {
-    const board = Boards.findOne(Session.get('currentBoard'));
+    const board = Utils.getCurrentBoard();
    board.removeLabel(this._id);
    Popup.back(2);
  }),
  'submit .edit-label'(event, templateInstance) {
    event.preventDefault();
-    const board = Boards.findOne(Session.get('currentBoard'));
+    const board = Utils.getCurrentBoard();
    const name = templateInstance
      .$('#labelName')
      .val()
@@ -149,6 +151,6 @@ Template.editLabelPopup.events({

 Template.cardLabelsPopup.helpers({
  isLabelSelected(cardId) {
-    return _.contains(Cards.findOne(cardId).labelIds, this._id);
+    return _.contains(ReactiveCache.getCard(cardId).labelIds, this._id);
  },
 });
@@ -49,8 +49,7 @@ template(name="minicard")
        if currentBoard.allowsCardNumber
          span.card-number
            | ##{getCardNumber}
-        b
-          = getTitle
+        = getTitle
      if $eq 'subtext-with-full-path' currentBoard.presentParentTask
        .parent-subtext
          | {{ parentString ' > ' }}
@@ -130,11 +129,11 @@ template(name="minicard")

    .badges
      unless currentUser.isNoComments
-        if comments.count
-          .badge(title="{{_ 'card-comments-title' comments.count }}")
+        if comments.length
+          .badge(title="{{_ 'card-comments-title' comments.length }}")
            span.badge-icon.fa.fa-comment-o.badge-comment
              = ' '
-              = comments.count
+              = comments.length
            //span.badge-comment.badge-text
            //|  {{_ 'comment'}}
      if getDescription
@@ -157,7 +156,7 @@ template(name="minicard")
          .badge
            span.badge-icon.fa.fa-paperclip
            span.badge-text= attachments.length
-      if checklists.count
+      if checklists.length
        .badge(class="{{#if checklistFinished}}is-finished{{/if}}")
          span.badge-icon.fa.fa-check-square-o
          span.badge-text.check-list-text {{checklistFinishedCount}}/{{checklistItemCount}}
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import { CustomFieldStringTemplate } from '/client/lib/customFields'

@@ -37,37 +38,45 @@ BlazeComponent.extendComponent({
  },

  showCreator() {
-    if (this.data().board()) {
-      return (
-        this.data().board.allowsCreator === null ||
-        this.data().board().allowsCreator === undefined ||
-        this.data().board().allowsCreator
-      );
-      // return this.data().board().allowsCreator;
+    // cache "board" to reduce the mini-mongodb access
+    const board = this.data().board();
+    let ret = false;
+    if (board) {
+      ret =
+        board.allowsCreator === null ||
+        board.allowsCreator === undefined ||
+        board.allowsCreator
+      ;
    }
-    return false;
+    return ret;
  },

  showMembers() {
-    if (this.data().board()) {
-      return (
-        this.data().board.allowsMembers === null ||
-        this.data().board().allowsMembers === undefined ||
-        this.data().board().allowsMembers
-      );
+    // cache "board" to reduce the mini-mongodb access
+    const board = this.data().board();
+    let ret = false;
+    if (board) {
+      ret =
+        board.allowsMembers === null ||
+        board.allowsMembers === undefined ||
+        board.allowsMembers
+      ;
    }
-    return false;
+    return ret;
  },

  showAssignee() {
-    if (this.data().board()) {
-      return (
-        this.data().board.allowsAssignee === null ||
-        this.data().board().allowsAssignee === undefined ||
-        this.data().board().allowsAssignee
-      );
+    // cache "board" to reduce the mini-mongodb access
+    const board = this.data().board();
+    let ret = false;
+    if (board) {
+      ret =
+        board.allowsAssignee === null ||
+        board.allowsAssignee === undefined ||
+        board.allowsAssignee
+      ;
    }
-    return false;
+    return ret;
  },

  /** opens the card label popup only if clicked onto a label
@@ -105,7 +114,7 @@ BlazeComponent.extendComponent({

 Template.minicard.helpers({
  hiddenMinicardLabelText() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).hiddenMinicardLabelText;
    } else if (window.localStorage.getItem('hiddenMinicardLabelText')) {
@@ -1,22 +1,24 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  addSubtask(event) {
    event.preventDefault();
    const textarea = this.find('textarea.js-add-subtask-item');
    const title = textarea.value.trim();
    const cardId = this.currentData().cardId;
-    const card = Cards.findOne(cardId);
+    const card = ReactiveCache.getCard(cardId);
    const sortIndex = -1;
-    const crtBoard = Boards.findOne(card.boardId);
+    const crtBoard = ReactiveCache.getBoard(card.boardId);
    const targetBoard = crtBoard.getDefaultSubtasksBoard();
    const listId = targetBoard.getDefaultSubtasksListId();

    //Get the full swimlane data for the parent task.
-    const parentSwimlane = Swimlanes.findOne({
+    const parentSwimlane = ReactiveCache.getSwimlane({
      boardId: crtBoard._id,
      _id: card.swimlaneId,
    });
    //find the swimlane of the same name in the target board.
-    const targetSwimlane = Swimlanes.findOne({
+    const targetSwimlane = ReactiveCache.getSwimlane({
      boardId: targetBoard._id,
      title: parentSwimlane.title,
    });
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 export function csvGetMembersToMap(data) {
  // we will work on the list itself (an ordered array of objects) when a
  // mapping is done, we add a 'wekan' field to the object representing the
@@ -28,7 +30,7 @@ export function csvGetMembersToMap(data) {
      username: importedMember,
      id: importedMember,
    };
-    const wekanUser = Users.findOne({ username: importedMember.username });
+    const wekanUser = ReactiveCache.getUser({ username: importedMember.username });
    if (wekanUser) importedMember.wekanId = wekanUser._id;
    membersToMap.push(importedMember);
  }
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { trelloGetMembersToMap } from './trelloMembersMapper';
 import { wekanGetMembersToMap } from './wekanMembersMapper';
 import { csvGetMembersToMap } from './csvMembersMapper';
@@ -174,9 +175,9 @@ BlazeComponent.extendComponent({
            this._refreshMembers(
              this.members().map(member => {
                if (!member.wekanId) {
-                  let user = Users.findOne({ username: member.username });
+                  let user = ReactiveCache.getUser({ username: member.username });
                  if (!user) {
-                    user = Users.findOne({ importUsernames: member.username });
+                    user = ReactiveCache.getUser({ importUsernames: member.username });
                  }
                  if (user) {
                    // eslint-disable-next-line no-console
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 export function trelloGetMembersToMap(data) {
  // we will work on the list itself (an ordered array of objects) when a
  // mapping is done, we add a 'wekan' field to the object representing the
@@ -5,7 +7,7 @@ export function trelloGetMembersToMap(data) {
  const membersToMap = data.members;
  // auto-map based on username
  membersToMap.forEach(importedMember => {
-    const wekanUser = Users.findOne({ username: importedMember.username });
+    const wekanUser = ReactiveCache.getUser({ username: importedMember.username });
    if (wekanUser) {
      importedMember.wekanId = wekanUser._id;
    }
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 export function wekanGetMembersToMap(data) {
  // we will work on the list itself (an ordered array of objects) when a
  // mapping is done, we add a 'wekan' field to the object representing the
@@ -15,7 +17,7 @@ export function wekanGetMembersToMap(data) {
      importedMember.fullName = user.profile.fullname;
    }
    importedMember.username = user.username;
-    const wekanUser = Users.findOne({ username: importedMember.username });
+    const wekanUser = ReactiveCache.getUser({ username: importedMember.username });
    if (wekanUser) {
      importedMember.wekanId = wekanUser._id;
    }
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 require('/client/lib/jquery-ui.js')

@@ -23,14 +24,6 @@ BlazeComponent.extendComponent({
  onRendered() {
    const boardComponent = this.parentComponent().parentComponent();

-    function userIsMember() {
-      return (
-        Meteor.user() &&
-        Meteor.user().isBoardMember() &&
-        !Meteor.user().isCommentOnly()
-      );
-    }
-
    const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)';
    const $cards = this.$('.js-minicards');

@@ -75,7 +68,7 @@ BlazeComponent.extendComponent({
        const nCards = MultiSelection.isActive() ? MultiSelection.count() : 1;
        const sortIndex = calculateIndex(prevCardDom, nextCardDom, nCards);
        const listId = Blaze.getData(ui.item.parents('.list').get(0))._id;
-        const currentBoard = Boards.findOne(Session.get('currentBoard'));
+        const currentBoard = Utils.getCurrentBoard();
        const defaultSwimlaneId = currentBoard.getDefaultSwimline()._id;
        let targetSwimlaneId = null;

@@ -97,7 +90,7 @@ BlazeComponent.extendComponent({
        $cards.sortable('cancel');

        if (MultiSelection.isActive()) {
-          Cards.find(MultiSelection.getMongoSelector(), { sort: ['sort'] }).forEach((card, i) => {
+          ReactiveCache.getCards(MultiSelection.getMongoSelector(), { sort: ['sort'] }).forEach((card, i) => {
            const newSwimlaneId = targetSwimlaneId
              ? targetSwimlaneId
              : card.swimlaneId || defaultSwimlaneId;
@@ -169,9 +162,9 @@ BlazeComponent.extendComponent({
          'option',
          'disabled',
          // Disable drag-dropping when user is not member
-          !userIsMember(),
+          !Utils.canModifyBoard(),
          // Not disable drag-dropping while in multi-selection mode
-          // MultiSelection.isActive() || !userIsMember(),
+          // MultiSelection.isActive() || !Utils.canModifyBoard(),
        );
      }
    });
@@ -181,14 +174,13 @@ BlazeComponent.extendComponent({
      const currentBoardId = Tracker.nonreactive(() => {
        return Session.get('currentBoard');
      });
-      Cards.find({ boardId: currentBoardId }).fetch();
      Tracker.afterFlush(() => {
        $cards.find(itemsSelector).droppable({
          hoverClass: 'draggable-hover-card',
          accept: '.js-member,.js-label',
          drop(event, ui) {
            const cardId = Blaze.getData(this)._id;
-            const card = Cards.findOne(cardId);
+            const card = ReactiveCache.getCard(cardId);

            if (ui.draggable.hasClass('js-member')) {
              const memberId = Blaze.getData(ui.draggable.get(0)).userId;
@@ -1,7 +1,7 @@
 template(name="listBody")
  .list-body
    .minicards.clearfix.js-minicards(class="{{#if reachedWipLimit}}js-list-full{{/if}}")
-      if cards.count
+      if cards.length
        +inlinedForm(autoclose=false position="top")
          +addCardForm(listId=_id position="top")
      ul.sidebar-list
@@ -95,7 +95,7 @@ template(name="linkCardPopup")
  label {{_ 'cards'}}:
  select.js-select-cards
    each cards
-      option(value="{{getId}}") {{getTitle}}
+      option(value="{{getRealId}}") {{getTitle}}

  .edit-controls.clearfix
    input.primary.confirm.js-done(type="button" value="{{_ 'link'}}")
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import { Spinner } from '/client/lib/spinner';

@@ -15,10 +16,11 @@ BlazeComponent.extendComponent({
  },

  customFieldsSum() {
-    return CustomFields.find({
+    const ret = ReactiveCache.getCustomFields({
      boardIds: { $in: [Session.get('currentBoard')] },
      showSumAtTopOfList: true,
    });
+    return ret;
  },

  openForm(options) {
@@ -64,7 +66,7 @@ BlazeComponent.extendComponent({
        swimlaneId = this.parentComponent()
          .parentComponent()
          .data()._id; // Always swimlanes view
-        const swimlane = Swimlanes.findOne(swimlaneId);
+        const swimlane = ReactiveCache.getSwimlane(swimlaneId);
        // If this is the card templates swimlane, insert a card template
        if (swimlane.isCardTemplatesSwimlane()) cardType = 'template-card';
        // If this is the board templates swimlane, insert a board template and a linked card
@@ -112,7 +114,7 @@ BlazeComponent.extendComponent({
      // to appear
      const cardCount = this.data()
        .cards(this.idOrNull(swimlaneId))
-        .count();
+        .length;
      if (this.cardlimit.get() < cardCount) {
        this.cardlimit.set(this.cardlimit.get() + InfiniteScrollIter);
      }
@@ -200,25 +202,23 @@ BlazeComponent.extendComponent({
      archived: false,
    };
    if (swimlaneId) selector.swimlaneId = swimlaneId;
-    return Cards.find(Filter.mongoSelector(selector), {
+    const ret = ReactiveCache.getCards(Filter.mongoSelector(selector), {
      // sort: ['sort'],
      sort: sortBy,
      limit,
-    });
+    }, true);
+    return ret;
  },

  showSpinner(swimlaneId) {
    const list = Template.currentData();
-    return list.cards(swimlaneId).count() > this.cardlimit.get();
+    return list.cards(swimlaneId).length > this.cardlimit.get();
  },

  canSeeAddCard() {
    return (
      !this.reachedWipLimit() &&
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
+      Utils.canModifyCard()
    );
  },

@@ -227,7 +227,7 @@ BlazeComponent.extendComponent({
    return (
      !list.getWipLimit('soft') &&
      list.getWipLimit('enabled') &&
-      list.getWipLimit('value') <= list.cards().count()
+      list.getWipLimit('value') <= list.cards().length
    );
  },

@@ -269,9 +269,8 @@ BlazeComponent.extendComponent({
    const currentBoardId = Session.get('currentBoard');
    arr = [];
    _.forEach(
-      Boards.findOne(currentBoardId)
-        .customFields()
-        .fetch(),
+      ReactiveCache.getBoard(currentBoardId)
+        .customFields(),
      function (field) {
        if (field.automaticallyOnCard || field.alwaysOnCard)
          arr.push({ _id: field._id, value: null });
@@ -288,8 +287,8 @@ BlazeComponent.extendComponent({

  getLabels() {
    const currentBoardId = Session.get('currentBoard');
-    if (Boards.findOne(currentBoardId).labels) {
-      return Boards.findOne(currentBoardId).labels.filter(label => {
+    if (ReactiveCache.getBoard(currentBoardId).labels) {
+      return ReactiveCache.getBoard(currentBoardId).labels.filter(label => {
        return this.labels.get().indexOf(label._id) > -1;
      });
    }
@@ -349,10 +348,10 @@ BlazeComponent.extendComponent({
        {
          match: /\B@([\w.-]*)$/,
          search(term, callback) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+            const currentBoard = Utils.getCurrentBoard();
            callback(
              $.map(currentBoard.activeMembers(), member => {
-                const user = Users.findOne(member.userId);
+                const user = ReactiveCache.getUser(member.userId);
                return user.username.indexOf(term) === 0 ? user : null;
              }),
            );
@@ -374,7 +373,7 @@ BlazeComponent.extendComponent({
        {
          match: /\B#(\w*)$/,
          search(term, callback) {
-            const currentBoard = Boards.findOne(Session.get('currentBoard'));
+            const currentBoard = Utils.getCurrentBoard();
            callback(
              $.map(currentBoard.labels, label => {
                if (label.name == undefined) {
@@ -430,10 +429,10 @@ BlazeComponent.extendComponent({
    this.boardId = Session.get('currentBoard');
    // In order to get current board info
    subManager.subscribe('board', this.boardId, false);
-    this.board = Boards.findOne(this.boardId);
+    this.board = ReactiveCache.getBoard(this.boardId);
    // List where to insert card
-    const list = $(Popup._getTopStack().openerElement).closest('.js-list');
-    this.listId = Blaze.getData(list[0])._id;
+    this.list = $(Popup._getTopStack().openerElement).closest('.js-list');
+    this.listId = Blaze.getData(this.list[0])._id;
    // Swimlane where to insert card
    const swimlane = $(Popup._getTopStack().openerElement).closest(
      '.js-swimlane',
@@ -442,11 +441,11 @@ BlazeComponent.extendComponent({
    if (Utils.boardView() === 'board-view-swimlanes')
      this.swimlaneId = Blaze.getData(swimlane[0])._id;
    else if (Utils.boardView() === 'board-view-lists' || !Utils.boardView)
-      this.swimlaneId = Swimlanes.findOne({ boardId: this.boardId })._id;
+      this.swimlaneId = ReactiveCache.getSwimlane({ boardId: this.boardId })._id;
  },

  boards() {
-    const boards = Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
@@ -457,16 +456,22 @@ BlazeComponent.extendComponent({
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
-    return boards;
+    return ret;
  },

  swimlanes() {
    if (!this.selectedBoardId.get()) {
      return [];
    }
-    const swimlanes = Swimlanes.find({ boardId: this.selectedBoardId.get() });
-    if (swimlanes.count())
-      this.selectedSwimlaneId.set(swimlanes.fetch()[0]._id);
+    const swimlanes = ReactiveCache.getSwimlanes(
+    {
+      boardId: this.selectedBoardId.get()
+    },
+    {
+      sort: { sort: 1 },
+    });
+    if (swimlanes.length)
+      this.selectedSwimlaneId.set(swimlanes[0]._id);
    return swimlanes;
  },

@@ -474,8 +479,14 @@ BlazeComponent.extendComponent({
    if (!this.selectedBoardId.get()) {
      return [];
    }
-    const lists = Lists.find({ boardId: this.selectedBoardId.get() });
-    if (lists.count()) this.selectedListId.set(lists.fetch()[0]._id);
+    const lists = ReactiveCache.getLists(
+    {
+      boardId: this.selectedBoardId.get()
+    },
+    {
+      sort: { sort: 1 },
+    });
+    if (lists.length) this.selectedListId.set(lists[0]._id);
    return lists;
  },

@@ -483,10 +494,9 @@ BlazeComponent.extendComponent({
    if (!this.board) {
      return [];
    }
-    const ownCardsIds = this.board.cards().map(card => {
-      return card.linkedId || card._id;
-    });
-    return Cards.find({
+    const ownCardsIds = this.board.cards().map(card => card.getRealId());
+    const ret = ReactiveCache.getCards(
+    {
      boardId: this.selectedBoardId.get(),
      swimlaneId: this.selectedSwimlaneId.get(),
      listId: this.selectedListId.get(),
@@ -494,7 +504,24 @@ BlazeComponent.extendComponent({
      linkedId: { $nin: ownCardsIds },
      _id: { $nin: ownCardsIds },
      type: { $nin: ['template-card'] },
+    },
+    {
+      sort: { sort: 1 },
    });
+    return ret;
+  },
+
+  getSortIndex() {
+    const position = this.currentData().position;
+    let ret;
+    if (position === 'top') {
+      const firstCardDom = this.list.find('.js-minicard:first')[0];
+      ret = Utils.calculateIndex(null, firstCardDom).base;
+    } else if (position === 'bottom') {
+      const lastCardDom = this.list.find('.js-minicard:last')[0];
+      ret = Utils.calculateIndex(lastCardDom, null).base;
+    }
+    return ret;
  },

  events() {
@@ -519,16 +546,17 @@ BlazeComponent.extendComponent({
            Popup.back();
            return;
          }
+          const nextCardNumber = this.board.getNextCardNumber();
+          const sortIndex = this.getSortIndex();
          const _id = Cards.insert({
            title: $('.js-select-cards option:selected').text(), //dummy
            listId: this.listId,
            swimlaneId: this.swimlaneId,
            boardId: this.boardId,
-            sort: Lists.findOne(this.listId)
-              .cards()
-              .count(),
+            sort: sortIndex,
            type: 'cardType-linkedCard',
            linkedId,
+            cardNumber: nextCardNumber,
          });
          Filter.addException(_id);
          Popup.back();
@@ -540,21 +568,22 @@ BlazeComponent.extendComponent({
          const impBoardId = $('.js-select-boards option:selected').val();
          if (
            !impBoardId ||
-            Cards.findOne({ linkedId: impBoardId, archived: false })
+            ReactiveCache.getCard({ linkedId: impBoardId, archived: false })
          ) {
            Popup.back();
            return;
          }
+          const nextCardNumber = this.board.getNextCardNumber();
+          const sortIndex = this.getSortIndex();
          const _id = Cards.insert({
            title: $('.js-select-boards option:selected').text(), //dummy
            listId: this.listId,
            swimlaneId: this.swimlaneId,
            boardId: this.boardId,
-            sort: Lists.findOne(this.listId)
-              .cards()
-              .count(),
+            sort: sortIndex,
            type: 'cardType-linkedBoard',
            linkedId: impBoardId,
+            cardNumber: nextCardNumber,
          });
          Filter.addException(_id);
          Popup.back();
@@ -587,36 +616,27 @@ BlazeComponent.extendComponent({
      this.isListTemplateSearch ||
      this.isSwimlaneTemplateSearch ||
      this.isBoardTemplateSearch;
-    let board = {};
+
+    this.board = {};
    if (this.isTemplateSearch) {
-      //board = Boards.findOne((Meteor.user().profile || {}).templatesBoardId);
-      board._id = (Meteor.user().profile || {}).templatesBoardId;
+      const boardId = (ReactiveCache.getCurrentUser().profile || {}).templatesBoardId;
+      if (boardId) {
+        this.board = ReactiveCache.getBoard(boardId);
+      }
    } else {
-      // Prefetch first non-current board id
-      board = Boards.find({
-        archived: false,
-        'members.userId': Meteor.userId(),
-        _id: {
-          $nin: [
-            Session.get('currentBoard'),
-            (Meteor.user().profile || {}).templatesBoardId,
-          ],
-        },
-      });
+      this.board = Utils.getCurrentBoard();
    }
-    if (!board) {
+    if (!this.board) {
      Popup.back();
      return;
    }
-    const boardId = board._id;
+    this.boardId = this.board._id;
    // Subscribe to this board
-    subManager.subscribe('board', boardId, false);
-    this.selectedBoardId = new ReactiveVar(boardId);
+    subManager.subscribe('board', this.boardId, false);
+    this.selectedBoardId = new ReactiveVar(this.boardId);
+    this.list = $(Popup._getTopStack().openerElement).closest('.js-list');

    if (!this.isBoardTemplateSearch) {
-      this.boardId = Session.get('currentBoard');
-      // In order to get current board info
-      subManager.subscribe('board', this.boardId, false);
      this.swimlaneId = '';
      // Swimlane where to insert card
      const swimlane = $(Popup._getTopStack().openerElement).parents(
@@ -624,16 +644,15 @@ BlazeComponent.extendComponent({
      );
      if (Utils.boardView() === 'board-view-swimlanes')
        this.swimlaneId = Blaze.getData(swimlane[0])._id;
-      else this.swimlaneId = Swimlanes.findOne({ boardId: this.boardId })._id;
+      else this.swimlaneId = ReactiveCache.getSwimlane({ boardId: this.boardId })._id;
      // List where to insert card
-      const list = $(Popup._getTopStack().openerElement).closest('.js-list');
-      this.listId = Blaze.getData(list[0])._id;
+      this.listId = Blaze.getData(this.list[0])._id;
    }
    this.term = new ReactiveVar('');
  },

  boards() {
-    const boards = Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
@@ -644,14 +663,14 @@ BlazeComponent.extendComponent({
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
-    return boards;
+    return ret;
  },

  results() {
    if (!this.selectedBoardId) {
      return [];
    }
-    const board = Boards.findOne(this.selectedBoardId.get());
+    const board = ReactiveCache.getBoard(this.selectedBoardId.get());
    if (!this.isTemplateSearch || this.isCardTemplateSearch) {
      return board.searchCards(this.term.get(), false);
    } else if (this.isListTemplateSearch) {
@@ -669,6 +688,19 @@ BlazeComponent.extendComponent({
    }
  },

+  getSortIndex() {
+    const position = this.data().position;
+    let ret;
+    if (position === 'top') {
+      const firstCardDom = this.list.find('.js-minicard:first')[0];
+      ret = Utils.calculateIndex(null, firstCardDom).base;
+    } else if (position === 'bottom') {
+      const lastCardDom = this.list.find('.js-minicard:last')[0];
+      ret = Utils.calculateIndex(lastCardDom, null).base;
+    }
+    return ret;
+  },
+
  events() {
    return [
      {
@@ -692,9 +724,8 @@ BlazeComponent.extendComponent({
          if (!this.isTemplateSearch || this.isCardTemplateSearch) {
            // Card insertion
            // 1. Common
-            element.sort = Lists.findOne(this.listId)
-              .cards()
-              .count();
+            element.cardNumber = this.board.getNextCardNumber();
+            element.sort = this.getSortIndex();
            // 1.A From template
            if (this.isTemplateSearch) {
              element.type = 'cardType-card';
@@ -707,15 +738,15 @@ BlazeComponent.extendComponent({
            Filter.addException(_id);
            // List insertion
          } else if (this.isListTemplateSearch) {
-            element.sort = Swimlanes.findOne(this.swimlaneId)
+            element.sort = ReactiveCache.getSwimlane(this.swimlaneId)
              .lists()
-              .count();
+              .length;
            element.type = 'list';
            _id = element.copy(this.boardId, this.swimlaneId);
          } else if (this.isSwimlaneTemplateSearch) {
-            element.sort = Boards.findOne(this.boardId)
+            element.sort = ReactiveCache.getBoard(this.boardId)
              .swimlanes()
-              .count();
+              .length;
            element.type = 'swimlane';
            _id = element.copy(this.boardId);
          } else if (this.isBoardTemplateSearch) {
@@ -723,7 +754,7 @@ BlazeComponent.extendComponent({
              'copyBoard',
              element.linkedId,
              {
-                sort: Boards.find({ archived: false }).count(),
+                sort: ReactiveCache.getBoards({ archived: false }).length,
                type: 'board',
                title: element.title,
              },
@@ -757,7 +788,7 @@ BlazeComponent.extendComponent({
      Meteor.settings.public.sandstorm;

    if (isSandstorm) {
-      const user = Meteor.user();
+      const user = ReactiveCache.getCurrentUser();
      if (user) {
        if (Utils.boardView() === 'board-view-swimlanes') {
          this.swimlaneId = this.parentComponent()
@@ -15,11 +15,11 @@ template(name="listHeader")
          = title
        if wipLimit.enabled
         |&nbsp;(
-         span(class="{{#if exceededWipLimit}}highlight{{/if}}") {{cards.count}}
+         span(class="{{#if exceededWipLimit}}highlight{{/if}}") {{cards.length}}
         |/#{wipLimit.value})

-      if showCardsCountForList cards.count
-        span.cardCount {{cardsCount}} {{cardsCountForListIsOne cards.count}}
+      if showCardsCountForList cards.length
+        span.cardCount {{cardsCount}} {{cardsCountForListIsOne cards.length}}

      if isMiniScreen
        if currentList
@@ -79,7 +79,7 @@ template(name="listActionPopup")
            i.fa.fa-paint-brush
            | {{_ 'set-color-list'}}
    ul.pop-over-list
-      if cards.count
+      if cards.length
        li
          a.js-select-cards
            i.fa.fa-check-square
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 let listsColors;
@@ -12,12 +13,12 @@ BlazeComponent.extendComponent({
      (!list.getWipLimit('enabled') ||
        list.getWipLimit('soft') ||
        !this.reachedWipLimit()) &&
-      !Meteor.user().isWorker()
+      !ReactiveCache.getCurrentUser().isWorker()
    );
  },

  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
  starred(check = undefined) {
    const list = Template.currentData();
@@ -47,9 +48,9 @@ BlazeComponent.extendComponent({
  },

  limitToShowCardsCount() {
-    const currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
-      return Meteor.user().getLimitToShowCardsCount();
+      return currentUser.getLimitToShowCardsCount();
    } else {
      return false;
    }
@@ -63,14 +64,15 @@ BlazeComponent.extendComponent({
        .parentComponent()
        .data()._id;

-    return list.cards(swimlaneId).count();
+    const ret = list.cards(swimlaneId).length;
+    return ret;
  },

  reachedWipLimit() {
    const list = Template.currentData();
    return (
      list.getWipLimit('enabled') &&
-      list.getWipLimit('value') <= list.cards().count()
+      list.getWipLimit('value') <= list.cards().length
    );
  },

@@ -78,7 +80,7 @@ BlazeComponent.extendComponent({
    const list = Template.currentData();
    return (
      list.getWipLimit('enabled') &&
-      list.getWipLimit('value') < list.cards().count()
+      list.getWipLimit('value') < list.cards().length
    );
  },

@@ -123,13 +125,13 @@ BlazeComponent.extendComponent({

 Template.listHeader.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  }
 });

 Template.listActionPopup.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },

  isWipLimitEnabled() {
@@ -183,7 +185,7 @@ BlazeComponent.extendComponent({
      10,
    );

-    if (limit < list.cards().count() && !list.getWipLimit('soft')) {
+    if (limit < list.cards().length && !list.getWipLimit('soft')) {
      Template.instance()
        .$('.wip-limit-error')
        .click();
@@ -198,9 +200,9 @@ BlazeComponent.extendComponent({

    if (
      list.getWipLimit('soft') &&
-      list.getWipLimit('value') < list.cards().count()
+      list.getWipLimit('value') < list.cards().length
    ) {
-      list.setWipLimit(list.cards().count());
+      list.setWipLimit(list.cards().length);
    }
    Meteor.call('enableSoftLimit', Template.currentData()._id);
  },
@@ -210,9 +212,9 @@ BlazeComponent.extendComponent({
    // Prevent user from using previously stored wipLimit.value if it is less than the current number of cards in the list
    if (
      !list.getWipLimit('enabled') &&
-      list.getWipLimit('value') < list.cards().count()
+      list.getWipLimit('value') < list.cards().length
    ) {
-      list.setWipLimit(list.cards().count());
+      list.setWipLimit(list.cards().length);
    }
    Meteor.call('enableWipLimit', list._id);
  },
@@ -244,17 +246,16 @@ BlazeComponent.extendComponent({
 Template.listMorePopup.events({
  'click .js-delete': Popup.afterConfirm('listDelete', function() {
    Popup.back();
-    // TODO how can we avoid the fetch call?
-    const allCards = this.allCards().fetch();
+    const allCards = this.allCards();
    const allCardIds = _.pluck(allCards, '_id');
    // it's okay if the linked cards are on the same list
    if (
-      Cards.find({
+      ReactiveCache.getCards({
        $and: [
          { listId: { $ne: this._id } },
          { linkedId: { $in: allCardIds } },
        ],
-      }).count() === 0
+      }).length === 0
    ) {
      allCardIds.map(_id => Cards.remove(_id));
      Lists.remove(this._id);
@@ -279,7 +280,7 @@ Template.listMorePopup.events({

 Template.listHeader.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
 });

@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { CardSearchPagedComponent } from '../../lib/cardSearch';
 import {
  OPERATOR_HAS,
@@ -66,7 +67,7 @@ class DueCardsComponent extends CardSearchPagedComponent {
    });

    if (Utils.dueCardsView() !== 'all') {
-      queryParams.addPredicate(OPERATOR_USER, Meteor.user().username);
+      queryParams.addPredicate(OPERATOR_USER, ReactiveCache.getCurrentUser().username);
    }

    this.runGlobalSearch(queryParams);
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 const specialHandles = [
  {userId: 'board_members', username: 'board_members'},
  {userId: 'card_members', username: 'card_members'}
@@ -13,13 +15,13 @@ BlazeComponent.extendComponent({
      {
        match: /\B@([\w.-]*)$/,
        search(term, callback) {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
          callback(
            _.union(
            currentBoard
              .activeMembers()
              .map(member => {
-                const user = Users.findOne(member.userId);
+                const user = ReactiveCache.getUser(member.userId);
                const username = user.username;
                const fullName = user.profile && user.profile !== undefined && user.profile.fullname ? user.profile.fullname : "";
                return username.includes(term) || fullName.includes(term) ? user : null;
@@ -328,13 +330,13 @@ Blaze.Template.registerHelper(
  new Template('mentions', function() {
    const view = this;
    let content = Blaze.toHTML(view.templateContentBlock);
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    if (!currentBoard)
      return HTML.Raw(
        DOMPurify.sanitize(content, { ALLOW_UNKNOWN_PROTOCOLS: true }),
      );
    const knowedUsers = _.union(currentBoard.members.map(member => {
-      const u = Users.findOne(member.userId);
+      const u = ReactiveCache.getUser(member.userId);
      if (u) {
        member.username = u.username;
      }
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 Meteor.subscribe('user-admin');
 Meteor.subscribe('boards');
 Meteor.subscribe('setting');
@@ -9,7 +11,7 @@ Template.header.onCreated(function(){

  Meteor.subscribe('setting', {
    onReady() {
-      templateInstance.currentSetting.set(Settings.findOne());
+      templateInstance.currentSetting.set(ReactiveCache.getCurrentSetting());
      let currSetting = templateInstance.currentSetting.curValue;
      if(currSetting && currSetting !== undefined && currSetting.customLoginLogoImageUrl !== undefined && document.getElementById("headerIsSettingDatabaseCallDone") != null)
        document.getElementById("headerIsSettingDatabaseCallDone").style.display = 'none';
@@ -24,10 +26,6 @@ Template.header.helpers({
    return !Session.get('currentBoard');
  },

-  currentSetting() {
-    return Settings.findOne();
-  },
-
  hideLogo() {
    return Utils.isMiniScreen() && Session.get('currentBoard');
  },
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 BlazeLayout.setRoot('body');
@@ -28,7 +29,7 @@ Template.userFormsLayout.onCreated(function () {

  Meteor.subscribe('setting', {
    onReady() {
-      templateInstance.currentSetting.set(Settings.findOne());
+      templateInstance.currentSetting.set(ReactiveCache.getCurrentSetting());
      let currSetting = templateInstance.currentSetting.curValue;
      let oidcBtnElt = $("#at-oidc");
      if(currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined){
@@ -50,7 +51,7 @@ Template.userFormsLayout.onCreated(function () {
    }
  });

-  if (!Meteor.user()?.profile) {
+  if (!ReactiveCache.getCurrentUser()?.profile) {
      Meteor.call('isOidcRedirectionEnabled', (_, result) => {
        if (result) {
          AccountsTemplates.options.socialLoginStyle = 'redirect';
@@ -85,10 +86,6 @@ Template.userFormsLayout.onRendered(() => {
 });

 Template.userFormsLayout.helpers({
-  currentSetting() {
-    return Template.instance().currentSetting.get();
-  },
-
  // isSettingDatabaseCallDone(){
  //   return isSettingDatabaseFctCallDone;
  // },
@@ -164,7 +161,7 @@ Template.userFormsLayout.events({
  },
  'DOMSubtreeModified #at-oidc'(event) {
    if (alreadyCheck <= 2) {
-      let currSetting = Settings.findOne();
+      let currSetting = ReactiveCache.getCurrentSetting();
      let oidcBtnElt = $("#at-oidc");
      if (currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined) {
        let htmlvalue = "<i class='fa fa-oidc'></i>" + currSetting.oidcBtnText;
@@ -185,7 +182,7 @@ Template.userFormsLayout.events({
  'DOMSubtreeModified .at-form'(event) {
    if (alreadyCheck <= 2 && !isCheckDone) {
      if (document.getElementById("at-oidc") != null) {
-        let currSetting = Settings.findOne();
+        let currSetting = ReactiveCache.getCurrentSetting();
        let oidcBtnElt = $("#at-oidc");
        if (currSetting && currSetting !== undefined && currSetting.oidcBtnText !== undefined && oidcBtnElt != null && oidcBtnElt != undefined) {
          let htmlvalue = "<i class='fa fa-oidc'></i>" + currSetting.oidcBtnText;
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 Template.notification.events({
  'click .read-status .materialCheckBox'() {
    const update = {};
@@ -7,22 +9,22 @@ Template.notification.events({
    Users.update(Meteor.userId(), { $set: update });
  },
  'click .remove a'() {
-    Meteor.user().removeNotification(this.activityData._id);
+    ReactiveCache.getCurrentUser().removeNotification(this.activityData._id);
  },
 });

 Template.notification.helpers({
  mode: 'board',
  isOfActivityType(activityId, type) {
-    const activity = Activities.findOne(activityId);
+    const activity = ReactiveCache.getActivity(activityId);
    return activity && activity.activityType === type;
  },
  activityType(activityId) {
-    const activity = Activities.findOne(activityId);
+    const activity = ReactiveCache.getActivity(activityId);
    return activity ? activity.activityType : '';
  },
  activityUser(activityId) {
-    const activity = Activities.findOne(activityId);
+    const activity = ReactiveCache.getActivity(activityId);
    return activity && activity.userId;
  },
 });
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 // this hides the notifications drawer if anyone clicks off of the panel
 Template.body.events({
  click(event) {
@@ -12,7 +14,7 @@ Template.body.events({

 Template.notifications.helpers({
  unreadNotifications() {
-    const notifications = Users.findOne(Meteor.userId()).notifications();
+    const notifications = ReactiveCache.getCurrentUser().notifications();
    const unreadNotifications = _.filter(notifications, v => !v.read);
    return unreadNotifications.length;
  },
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { toggleNotificationsDrawer } from './notifications.js';

 Template.notificationsDrawer.onCreated(function() {
@@ -14,11 +15,11 @@ Template.notificationsDrawer.onCreated(function() {

 Template.notificationsDrawer.helpers({
  transformedProfile() {
-    return Users.findOne(Meteor.userId());
+    return ReactiveCache.getCurrentUser();
  },
  readNotifications() {
    const readNotifications = _.filter(
-      Meteor.user().profile.notifications,
+      ReactiveCache.getCurrentUser().profile.notifications,
      v => !!v.read,
    );
    return readNotifications.length;
@@ -27,7 +28,7 @@ Template.notificationsDrawer.helpers({

 Template.notificationsDrawer.events({
  'click .all-read'() {
-    const notifications = Meteor.user().profile.notifications;
+    const notifications = ReactiveCache.getCurrentUser().profile.notifications;
    for (const index in notifications) {
      if (notifications.hasOwnProperty(index) && !notifications[index].read) {
        const update = {};
@@ -43,7 +44,7 @@ Template.notificationsDrawer.events({
    Session.set('showReadNotifications', !Session.get('showReadNotifications'));
  },
  'click .remove-read'() {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    for (const notification of user.profile.notifications) {
      if (notification.read) {
        user.removeNotification(notification.activity);
@@ -1,20 +1,22 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {},

  boards() {
-    const boards = Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
        _id: {
-          $ne: Meteor.user().getTemplatesBoardId(),
+          $ne: ReactiveCache.getCurrentUser().getTemplatesBoardId(),
        },
      },
      {
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
-    return boards;
+    return ret;
  },

  events() {
@@ -18,7 +18,7 @@ BlazeComponent.extendComponent({
  },

  labels() {
-    const labels = Boards.findOne(Session.get('currentBoard')).labels;
+    const labels = Utils.getCurrentBoard().labels;
    for (let i = 0; i < labels.length; i++) {
      if (labels[i].name === '' || labels[i].name === undefined) {
        labels[i].name = labels[i].color.toUpperCase();
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.subscribe('allRules');
@@ -7,24 +9,16 @@ BlazeComponent.extendComponent({

  trigger() {
    const ruleId = this.data().ruleId;
-    const rule = Rules.findOne({
-      _id: ruleId.get(),
-    });
-    const trigger = Triggers.findOne({
-      _id: rule.triggerId,
-    });
+    const rule = ReactiveCache.getRule(ruleId.get());
+    const trigger = ReactiveCache.getTrigger(rule.triggerId);
    const desc = trigger.description();
    const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1);
    return upperdesc;
  },
  action() {
    const ruleId = this.data().ruleId;
-    const rule = Rules.findOne({
-      _id: ruleId.get(),
-    });
-    const action = Actions.findOne({
-      _id: rule.actionId,
-    });
+    const rule = ReactiveCache.getRule(ruleId.get());
+    const action = ReactiveCache.getAction(rule.actionId);
    const desc = action.description();
    const upperdesc = desc.charAt(0).toUpperCase() + desc.substr(1);
    return upperdesc;
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.currentActions = new ReactiveVar('board');
@@ -33,7 +35,8 @@ BlazeComponent.extendComponent({
  },

  rules() {
-    return Rules.find({});
+    const ret = ReactiveCache.getRules({});
+    return ret;
  },

  name() {
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.subscribe('allRules');
@@ -5,9 +7,10 @@ BlazeComponent.extendComponent({

  rules() {
    const boardId = Session.get('currentBoard');
-    return Rules.find({
+    const ret = ReactiveCache.getRules({
      boardId,
    });
+    return ret;
  },
  events() {
    return [{}];
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.rulesCurrentTab = new ReactiveVar('rulesList');
@@ -55,7 +57,7 @@ BlazeComponent.extendComponent({
          let trigger = this.triggerVar.get();
          trigger.userId = '*';
          if (username !== undefined) {
-            const userFound = Users.findOne({ username });
+            const userFound = ReactiveCache.getUser({ username });
            if (userFound !== undefined) {
              trigger.userId = userFound._id;
              this.triggerVar.set(trigger);
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 BlazeComponent.extendComponent({
  onCreated() {
    this.showBoardTrigger = new ReactiveVar(true);
@@ -31,7 +33,8 @@ BlazeComponent.extendComponent({
  },

  rules() {
-    return Rules.find({});
+    const ret = ReactiveCache.getRules({});
+    return ret;
  },

  name() {
@@ -5,7 +5,7 @@ BlazeComponent.extendComponent({
    this.subscribe('allRules');
  },
  labels() {
-    const labels = Boards.findOne(Session.get('currentBoard')).labels;
+    const labels = Utils.getCurrentBoard().labels;
    for (let i = 0; i < labels.length; i++) {
      if (labels[i].name === '' || labels[i].name === undefined) {
        labels[i].name = labels[i].color;
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import { AttachmentStorage } from '/models/attachments';
 import { CardSearchPagedComponent } from '/client/lib/cardSearch';
@@ -123,7 +124,7 @@ class AdminReport extends BlazeComponent {
  }

  abbreviate(text) {
-    if (text.length > 30) {
+    if (text?.length > 30) {
      return `${text.substr(0, 29)}...`;
    }
    return text;
@@ -140,7 +141,7 @@ class AdminReport extends BlazeComponent {
  results() {
    const rules = [];

-    Rules.find().forEach(rule => {
+    ReactiveCache.getRules().forEach(rule => {
      rules.push({
        _id: rule._id,
        title: rule.title,
@@ -161,17 +162,13 @@ class AdminReport extends BlazeComponent {
  collection = Boards;

  userNames(members) {
-    let text = '';
-    members.forEach(member => {
-      const user = Users.findOne(member.userId);
-      text += text ? ', ' : '';
-      if (user) {
-        text += user.username;
-      } else {
-        text += member.userId
-      }
-    });
-    return text;
+    const ret = (members || [])
+      .map(_member => {
+        const _ret = ReactiveCache.getUser(_member.userId)?.username || _member.userId;
+        return _ret;
+      })
+      .join(", ");
+    return ret;
  }
 }.register('boardsReport'));

@@ -179,13 +176,13 @@ class AdminReport extends BlazeComponent {
  collection = Cards;

  userNames(userIds) {
-    let text = '';
-    userIds.forEach(userId => {
-      const user = Users.findOne(userId);
-      text += text ? ', ' : '';
-      text += user.username;
-    });
-    return text;
+    const ret = (userIds || [])
+      .map(_userId => {
+        const _ret = ReactiveCache.getUser(_userId)?.username;
+        return _ret;
+      })
+      .join(", ");
+    return ret
  }
 }.register('cardsReport'));

@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import Attachments, { fileStoreStrategyFactory } from '/models/attachments';
 const filesize = require('filesize');

@@ -44,7 +45,7 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  getBoardsWithAttachments() {
-    this.attachments = Attachments.find().get();
+    this.attachments = ReactiveCache.getAttachments();
    this.attachmentsByBoardId = _.chain(this.attachments)
      .groupBy(fileObj => fileObj.meta.boardId)
      .value();
@@ -61,14 +62,14 @@ BlazeComponent.extendComponent({
              return _version;
            });
        });
-        const board = Boards.findOne(boardId);
+        const board = ReactiveCache.getBoard(boardId);
        board.attachments = boardAttachments;
        return board;
      })
    return ret;
  },
  getBoardData(boardid) {
-    const ret = Boards.findOne(boardId);
+    const ret = ReactiveCache.getBoard(boardId);
    return ret;
  },
  events() {
@@ -1,7 +1,9 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 Template.invitationCode.onRendered(function() {
  Meteor.subscribe('setting', {
    onReady() {
-      const setting = Settings.findOne();
+      const setting = ReactiveCache.getCurrentSetting();

      if (!setting || !setting.disableRegistration) {
        $('#invitationcode').hide();
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 const orgsPerPage = 25;
 const teamsPerPage = 25;
 const usersPerPage = 25;
@@ -143,27 +145,27 @@ BlazeComponent.extendComponent({
    this.loading.set(w);
  },
  orgList() {
-    const orgs = Org.find(this.findOrgsOptions.get(), {
+    const orgs = ReactiveCache.getOrgs(this.findOrgsOptions.get(), {
      sort: { orgDisplayName: 1 },
      fields: { _id: true },
    });
-    this.numberOrgs.set(orgs.count(false));
+    this.numberOrgs.set(orgs.length);
    return orgs;
  },
  teamList() {
-    const teams = Team.find(this.findTeamsOptions.get(), {
+    const teams = ReactiveCache.getTeams(this.findTeamsOptions.get(), {
      sort: { teamDisplayName: 1 },
      fields: { _id: true },
    });
-    this.numberTeams.set(teams.count(false));
+    this.numberTeams.set(teams.length);
    return teams;
  },
  peopleList() {
-    const users = Users.find(this.findUsersOptions.get(), {
+    const users = ReactiveCache.getUsers(this.findUsersOptions.get(), {
      sort: { username: 1 },
      fields: { _id: true },
    });
-    this.numberPeople.set(users.count(false));
+    this.numberPeople.set(users.length);
    return users;
  },
  orgNumber() {
@@ -190,19 +192,19 @@ BlazeComponent.extendComponent({

 Template.orgRow.helpers({
  orgData() {
-    return Org.findOne(this.orgId);
+    return ReactiveCache.getOrg(this.orgId);
  },
 });

 Template.teamRow.helpers({
  teamData() {
-    return Team.findOne(this.teamId);
+    return ReactiveCache.getTeam(this.teamId);
  },
 });

 Template.peopleRow.helpers({
  userData() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
 });

@@ -227,7 +229,7 @@ Template.editUserPopup.onCreated(function () {

 Template.editOrgPopup.helpers({
  org() {
-    return Org.findOne(this.orgId);
+    return ReactiveCache.getOrg(this.orgId);
  },
  errorMessage() {
    return Template.instance().errorMessage.get();
@@ -236,7 +238,7 @@ Template.editOrgPopup.helpers({

 Template.editTeamPopup.helpers({
  team() {
-    return Team.findOne(this.teamId);
+    return ReactiveCache.getTeam(this.teamId);
  },
  errorMessage() {
    return Template.instance().errorMessage.get();
@@ -245,25 +247,27 @@ Template.editTeamPopup.helpers({

 Template.editUserPopup.helpers({
  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
  authentications() {
    return Template.instance().authenticationMethods.get();
  },
  orgsDatas() {
-    return Org.find({}, {sort: { orgDisplayName: 1 }});
+    const ret = ReactiveCache.getOrgs({}, {sort: { orgDisplayName: 1 }});
+    return ret;
  },
  teamsDatas() {
-    return Team.find({}, {sort: { teamDisplayName: 1 }});
+    const ret = ReactiveCache.getTeams({}, {sort: { teamDisplayName: 1 }});
+    return ret;
  },
  isSelected(match) {
    const userId = Template.instance().data.userId;
-    const selected = Users.findOne(userId).authenticationMethod;
+    const selected = ReactiveCache.getUser(userId).authenticationMethod;
    return selected === match;
  },
  isLdap() {
    const userId = Template.instance().data.userId;
-    const selected = Users.findOne(userId).authenticationMethod;
+    const selected = ReactiveCache.getUser(userId).authenticationMethod;
    return selected === 'ldap';
  },
  errorMessage() {
@@ -300,7 +304,7 @@ Template.newUserPopup.onCreated(function () {

 Template.newOrgPopup.helpers({
  org() {
-    return Org.findOne(this.orgId);
+    return ReactiveCache.getOrg(this.orgId);
  },
  errorMessage() {
    return Template.instance().errorMessage.get();
@@ -309,7 +313,7 @@ Template.newOrgPopup.helpers({

 Template.newTeamPopup.helpers({
  team() {
-    return Team.findOne(this.teamId);
+    return ReactiveCache.getTeam(this.teamId);
  },
  errorMessage() {
    return Template.instance().errorMessage.get();
@@ -318,21 +322,23 @@ Template.newTeamPopup.helpers({

 Template.newUserPopup.helpers({
  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
  authentications() {
    return Template.instance().authenticationMethods.get();
  },
  orgsDatas() {
-    return Org.find({}, {sort: { orgDisplayName: 1 }});
+    const ret = ReactiveCache.getOrgs({}, {sort: { orgDisplayName: 1 }});
+    return ret;
  },
  teamsDatas() {
-    return Team.find({}, {sort: { teamDisplayName: 1 }});
+    const ret = ReactiveCache.getTeams({}, {sort: { teamDisplayName: 1 }});
+    return ret;
  },
  isSelected(match) {
    const userId = Template.instance().data.userId;
    if(userId){
-      const selected = Users.findOne(userId).authenticationMethod;
+      const selected = ReactiveCache.getUser(userId).authenticationMethod;
      return selected === match;
    }
    else{
@@ -341,7 +347,7 @@ Template.newUserPopup.helpers({
  },
  isLdap() {
    const userId = Template.instance().data.userId;
-    const selected = Users.findOne(userId).authenticationMethod;
+    const selected = ReactiveCache.getUser(userId).authenticationMethod;
    return selected === 'ldap';
  },
  errorMessage() {
@@ -352,7 +358,7 @@ Template.newUserPopup.helpers({
 BlazeComponent.extendComponent({
  onCreated() {},
  org() {
-    return Org.findOne(this.orgId);
+    return ReactiveCache.getOrg(this.orgId);
  },
  events() {
    return [
@@ -367,7 +373,7 @@ BlazeComponent.extendComponent({
 BlazeComponent.extendComponent({
  onCreated() {},
  team() {
-    return Team.findOne(this.teamId);
+    return ReactiveCache.getTeam(this.teamId);
  },
  events() {
    return [
@@ -382,7 +388,7 @@ BlazeComponent.extendComponent({
 BlazeComponent.extendComponent({
  onCreated() {},
  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
  events() {
    return [
@@ -417,7 +423,8 @@ BlazeComponent.extendComponent({
 BlazeComponent.extendComponent({
  onCreated() {},
  teamsDatas() {
-    return Team.find({}, {sort: { teamDisplayName: 1 }});
+    const ret = ReactiveCache.getTeams({}, {sort: { teamDisplayName: 1 }});
+    return ret;
  },
  events() {
    return [
@@ -440,7 +447,7 @@ BlazeComponent.extendComponent({

          if(document.getElementById('addAction').checked){
            for(let i = 0; i < selectedUserChkBoxUserIds.length; i++){
-              currentUser = Users.findOne(selectedUserChkBoxUserIds[i]);
+              currentUser = ReactiveCache.getUser(selectedUserChkBoxUserIds[i]);
              userTms = currentUser.teams;
              if(userTms == undefined || userTms.length == 0){
                userTms = [];
@@ -469,7 +476,7 @@ BlazeComponent.extendComponent({
          }
          else{
            for(let i = 0; i < selectedUserChkBoxUserIds.length; i++){
-              currentUser = Users.findOne(selectedUserChkBoxUserIds[i]);
+              currentUser = ReactiveCache.getUser(selectedUserChkBoxUserIds[i]);
              userTms = currentUser.teams;
              if(userTms !== undefined || userTms.length > 0)
              {
@@ -562,7 +569,7 @@ BlazeComponent.extendComponent({
 Template.editOrgPopup.events({
  submit(event, templateInstance) {
    event.preventDefault();
-    const org = Org.findOne(this.orgId);
+    const org = ReactiveCache.getOrg(this.orgId);

    const orgDisplayName = templateInstance
      .find('.js-orgDisplayName')
@@ -603,7 +610,7 @@ Template.editOrgPopup.events({
 Template.editTeamPopup.events({
  submit(event, templateInstance) {
    event.preventDefault();
-    const team = Team.findOne(this.teamId);
+    const team = ReactiveCache.getTeam(this.teamId);

    const teamDisplayName = templateInstance
      .find('.js-teamDisplayName')
@@ -647,7 +654,7 @@ Template.editTeamPopup.events({
 Template.editUserPopup.events({
  submit(event, templateInstance) {
    event.preventDefault();
-    const user = Users.findOne(this.userId);
+    const user = ReactiveCache.getUser(this.userId);
    const username = templateInstance.find('.js-profile-username').value.trim();
    const fullname = templateInstance.find('.js-profile-fullname').value.trim();
    const initials = templateInstance.find('.js-profile-initials').value.trim();
@@ -1071,7 +1078,7 @@ Template.newUserPopup.events({
 Template.settingsOrgPopup.events({
  'click #deleteButton'(event) {
    event.preventDefault();
-    if(Users.find({"orgs.orgId": this.orgId}).count() > 0)
+    if (ReactiveCache.getUsers({"orgs.orgId": this.orgId}).length > 0)
    {
      let orgClassList = document.getElementById("deleteOrgWarningMessage").classList;
      if(orgClassList.contains('hide'))
@@ -1089,7 +1096,7 @@ Template.settingsOrgPopup.events({
 Template.settingsTeamPopup.events({
  'click #deleteButton'(event) {
    event.preventDefault();
-    if(Users.find({"teams.teamId": this.teamId}).count() > 0)
+    if (ReactiveCache.getUsers({"teams.teamId": this.teamId}).length > 0)
    {
      let teamClassList = document.getElementById("deleteTeamWarningMessage").classList;
      if(teamClassList.contains('hide'))
@@ -1139,19 +1146,19 @@ Template.settingsUserPopup.events({

 Template.settingsUserPopup.helpers({
  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
  authentications() {
    return Template.instance().authenticationMethods.get();
  },
  isSelected(match) {
    const userId = Template.instance().data.userId;
-    const selected = Users.findOne(userId).authenticationMethod;
+    const selected = ReactiveCache.getUser(userId).authenticationMethod;
    return selected === match;
  },
  isLdap() {
    const userId = Template.instance().data.userId;
-    const selected = Users.findOne(userId).authenticationMethod;
+    const selected = ReactiveCache.getUser(userId).authenticationMethod;
    return selected === 'ldap';
  },
  errorMessage() {
@@ -171,15 +171,15 @@ template(name='announcementSettings')
  ul#announcement-setting.setting-detail
    li
      a.flex.js-toggle-activemessage
-        .materialCheckBox(class="{{#if currentSetting.enabled}}is-checked{{/if}}")
+        .materialCheckBox(class="{{#if currentAnnouncements.enabled}}is-checked{{/if}}")

        span {{_ 'admin-announcement-active'}}
    li
-      .admin-announcement(class="{{#if currentSetting.enabled}}{{else}}hide{{/if}}")
+      .admin-announcement(class="{{#if currentAnnouncements.enabled}}{{else}}hide{{/if}}")
        ul
          li
            .title {{_ 'admin-announcement-title'}}
-            textarea#admin-announcement.wekan-form-control= currentSetting.body
+            textarea#admin-announcement.wekan-form-control= currentAnnouncements.body
          li
            button.js-announcement-save.primary {{_ 'save'}}

@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import { ALLOWED_WAIT_SPINNERS } from '/config/const';

@@ -42,12 +43,8 @@ BlazeComponent.extendComponent({
    }
  },

-  currentSetting() {
-    return Settings.findOne();
-  },
-
  boards() {
-    return Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
@@ -57,19 +54,20 @@ BlazeComponent.extendComponent({
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
+    return ret;
  },
  toggleForgotPassword() {
    this.setLoading(true);
-    const forgotPasswordClosed = this.currentSetting().disableForgotPassword;
-    Settings.update(Settings.findOne()._id, {
+    const forgotPasswordClosed = ReactiveCache.getCurrentSetting().disableForgotPassword;
+    Settings.update(ReactiveCache.getCurrentSetting()._id, {
      $set: { disableForgotPassword: !forgotPasswordClosed },
    });
    this.setLoading(false);
  },
  toggleRegistration() {
    this.setLoading(true);
-    const registrationClosed = this.currentSetting().disableRegistration;
-    Settings.update(Settings.findOne()._id, {
+    const registrationClosed = ReactiveCache.getCurrentSetting().disableRegistration;
+    Settings.update(ReactiveCache.getCurrentSetting()._id, {
      $set: { disableRegistration: !registrationClosed },
    });
    this.setLoading(false);
@@ -165,7 +163,7 @@ BlazeComponent.extendComponent({
        .trim();
      const from = this.checkField('#mail-server-from');
      const tls = $('#mail-server-tls.is-checked').length > 0;
-      Settings.update(Settings.findOne()._id, {
+      Settings.update(ReactiveCache.getCurrentSetting()._id, {
        $set: {
          'mailServer.host': host,
          'mailServer.port': port,
@@ -245,7 +243,7 @@ BlazeComponent.extendComponent({
    const spinnerName = $('#spinnerName').val();

    try {
-      Settings.update(Settings.findOne()._id, {
+      Settings.update(ReactiveCache.getCurrentSetting()._id, {
        $set: {
          productName,
          hideLogo: hideLogoChange,
@@ -416,7 +414,7 @@ BlazeComponent.extendComponent({
    this.loading.set(w);
  },

-  currentSetting() {
+  currentAnnouncements() {
    return Announcements.findOne();
  },

@@ -431,8 +429,9 @@ BlazeComponent.extendComponent({

  toggleActive() {
    this.setLoading(true);
-    const isActive = this.currentSetting().enabled;
-    Announcements.update(Announcements.findOne()._id, {
+    const announcements = this.currentAnnouncements();
+    const isActive = announcements.enabled;
+    Announcements.update(announcements._id, {
      $set: { enabled: !isActive },
    });
    this.setLoading(false);
@@ -13,7 +13,8 @@ template(name="sidebar")
          h2
            a.fa.fa-chevron-left.js-back-home
            = getViewTitle
-        +Template.dynamic(template=getViewTemplate)
+        if isOpen
+          +Template.dynamic(template=getViewTemplate)

 template(name='homeSidebar')
  hr
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 Sidebar = null;
@@ -111,7 +112,7 @@ BlazeComponent.extendComponent({
        'click .js-toggle-sidebar': this.toggle,
        'click .js-back-home': this.setView,
        'click .js-toggle-minicard-label-text'() {
-          currentUser = Meteor.user();
+          currentUser = ReactiveCache.getCurrentUser();
          if (currentUser) {
            Meteor.call('toggleMinicardLabelText');
          } else if (window.localStorage.getItem('hiddenMinicardLabelText')) {
@@ -137,7 +138,7 @@ Blaze.registerHelper('Sidebar', () => Sidebar);

 Template.homeSidebar.helpers({
  hiddenMinicardLabelText() {
-    currentUser = Meteor.user();
+    currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).hiddenMinicardLabelText;
    } else if (window.localStorage.getItem('hiddenMinicardLabelText')) {
@@ -149,9 +150,6 @@ Template.homeSidebar.helpers({
 });

 Template.boardInfoOnMyBoardsPopup.helpers({
-  currentSetting() {
-    return Settings.findOne();
-  },
  hideCardCounterList() {
    return Utils.isMiniScreen() && Session.get('currentBoard');
  },
@@ -172,15 +170,15 @@ EscapeActions.register(

 Template.memberPopup.helpers({
  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
  memberType() {
-    const type = Users.findOne(this.userId).isBoardAdmin() ? 'admin' : 'normal';
+    const type = ReactiveCache.getUser(this.userId).isBoardAdmin() ? 'admin' : 'normal';
    if (type === 'normal') {
-      const currentBoard = Boards.findOne(Session.get('currentBoard'));
+      const currentBoard = Utils.getCurrentBoard();
      const commentOnly = currentBoard.hasCommentOnly(this.userId);
      const noComments = currentBoard.hasNoComments(this.userId);
      const worker = currentBoard.hasWorker(this.userId);
@@ -198,7 +196,7 @@ Template.memberPopup.helpers({
    }
  },
  isInvited() {
-    return Users.findOne(this.userId).isInvitedTo(Session.get('currentBoard'));
+    return ReactiveCache.getUser(this.userId).isInvitedTo(Session.get('currentBoard'));
  },
 });

@@ -222,14 +220,14 @@ Template.boardMenuPopup.events({
  'click .js-board-info-on-my-boards': Popup.open('boardInfoOnMyBoards'),
  'click .js-change-language': Popup.open('changeLanguage'),
  'click .js-archive-board ': Popup.afterConfirm('archiveBoard', function() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    currentBoard.archive();
    // XXX We should have some kind of notification on top of the page to
    // confirm that the board was successfully archived.
    FlowRouter.go('home');
  }),
  'click .js-delete-board': Popup.afterConfirm('deleteBoard', function() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    Popup.back();
    Boards.remove(currentBoard._id);
    FlowRouter.go('home');
@@ -251,7 +249,7 @@ Template.boardMenuPopup.onCreated(function() {

 Template.boardMenuPopup.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
  withApi() {
    return Template.instance().apiEnabled.get();
@@ -281,13 +279,13 @@ Template.memberPopup.events({
    // This works from removing member from board, card members and assignees.
    const boardId = Session.get('currentBoard');
    const memberId = this.userId;
-    Cards.find({ boardId, members: memberId }).forEach(card => {
+    ReactiveCache.getCards({ boardId, members: memberId }).forEach(card => {
      card.unassignMember(memberId);
    });
-    Cards.find({ boardId, assignees: memberId }).forEach(card => {
+    ReactiveCache.getCards({ boardId, assignees: memberId }).forEach(card => {
      card.unassignAssignee(memberId);
    });
-    Boards.findOne(boardId).removeMember(memberId);
+    ReactiveCache.getBoard(boardId).removeMember(memberId);
    Popup.back();
  }),
  'click .js-leave-member': Popup.afterConfirm('leaveBoard', () => {
@@ -301,16 +299,16 @@ Template.memberPopup.events({

 Template.removeMemberPopup.helpers({
  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
  board() {
-    return Boards.findOne(Session.get('currentBoard'));
+    return Utils.getCurrentBoard();
  },
 });

 Template.leaveBoardPopup.helpers({
  board() {
-    return Boards.findOne(Session.get('currentBoard'));
+    return Utils.getCurrentBoard();
  },
 });
 BlazeComponent.extendComponent({
@@ -335,7 +333,6 @@ BlazeComponent.extendComponent({

  onRendered() {
    this.setLoading(false);
-    Utils.setBackgroundImage();
  },

  setError(error) {
@@ -361,11 +358,11 @@ BlazeComponent.extendComponent({

 Template.membersWidget.helpers({
  isInvited() {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    return user && user.isInvitedTo(Session.get('currentBoard'));
  },
  isWorker() {
-    const user = Meteor.user();
+    const user = ReactiveCache.getCurrentUser();
    if (user) {
      return Meteor.call(Boards.hasWorker(user.memberId));
    } else {
@@ -373,22 +370,22 @@ Template.membersWidget.helpers({
    }
  },
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
  AtLeastOneOrgWasCreated(){
-    let orgs = Org.find({}, {sort: { createdAt: -1 }});
+    let orgs = ReactiveCache.getOrgs({}, {sort: { createdAt: -1 }});
    if(orgs === undefined)
      return false;

-    return orgs.count() > 0;
+    return orgs.length > 0;
  },

  AtLeastOneTeamWasCreated(){
-    let teams = Team.find({}, {sort: { createdAt: -1 }});
+    let teams = ReactiveCache.getTeams({}, {sort: { createdAt: -1 }});
    if(teams === undefined)
      return false;

-    return teams.count() > 0;
+    return teams.length > 0;
  },
 });

@@ -409,13 +406,13 @@ Template.membersWidget.events({
  },
  'click .js-member-invite-accept'() {
    const boardId = Session.get('currentBoard');
-    Meteor.user().removeInvite(boardId);
+    ReactiveCache.getCurrentUser().removeInvite(boardId);
  },
  'click .js-member-invite-decline'() {
    const boardId = Session.get('currentBoard');
    Meteor.call('quitBoard', boardId, (err, ret) => {
      if (!err && ret) {
-        Meteor.user().removeInvite(boardId);
+        ReactiveCache.getCurrentUser().removeInvite(boardId);
        FlowRouter.go('home');
      }
    });
@@ -428,7 +425,8 @@ BlazeComponent.extendComponent({
  },
  integrations() {
    const boardId = this.boardId();
-    return Integrations.find({ boardId: `${boardId}` }).fetch();
+    const ret = ReactiveCache.getIntegrations({ boardId });
+    return ret;
  },
  types() {
    return Integrations.Const.WEBHOOK_TYPES;
@@ -439,7 +437,7 @@ BlazeComponent.extendComponent({
    for (const k in condition) {
      if (!condition[k]) delete condition[k];
    }
-    return Integrations.findOne(condition);
+    return ReactiveCache.getIntegration(condition);
  },
  onCreated() {
    this.disabled = new ReactiveVar(false);
@@ -607,7 +605,7 @@ Template.labelsWidget.events({

 Template.labelsWidget.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
 });

@@ -621,7 +619,7 @@ function draggableMembersLabelsWidgets() {
    const currentBoardId = Tracker.nonreactive(() => {
      return Session.get('currentBoard');
    });
-    Boards.findOne(currentBoardId, {
+    ReactiveCache.getBoard(currentBoardId, {
      fields: {
        members: 1,
        labels: 1,
@@ -642,7 +640,7 @@ function draggableMembersLabelsWidgets() {
      });

      function userIsMember() {
-        return Meteor.user() && Meteor.user().isBoardMember();
+        return ReactiveCache.getCurrentUser()?.isBoardMember();
      }

      this.autorun(() => {
@@ -661,7 +659,7 @@ BlazeComponent.extendComponent({
  },

  isSelected() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return currentBoard.color === this.currentData().toString();
  },

@@ -669,7 +667,7 @@ BlazeComponent.extendComponent({
    return [
      {
        'click .js-select-background'(evt) {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
          const newColor = this.currentData().toString();
          currentBoard.setColor(newColor);
          evt.preventDefault();
@@ -684,7 +682,7 @@ BlazeComponent.extendComponent({
    return [
      {
        submit(event) {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
          const backgroundImageURL = this.find('.js-board-background-image-url').value.trim();
          currentBoard.setBackgroundImageURL(backgroundImageURL);
          Utils.setBackgroundImage();
@@ -692,7 +690,7 @@ BlazeComponent.extendComponent({
          event.preventDefault();
        },
        'click .js-remove-background-image'() {
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
          currentBoard.setBackgroundImageURL("");
          Popup.back();
          Utils.reload();
@@ -705,14 +703,14 @@ BlazeComponent.extendComponent({

 Template.boardChangeBackgroundImagePopup.helpers({
  backgroundImageURL() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return currentBoard.backgroundImageURL;
  },
 });

 BlazeComponent.extendComponent({
  onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+    this.currentBoard = Utils.getCurrentBoard();
  },

  allowsCardCounterList() {
@@ -765,7 +763,7 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+    this.currentBoard = Utils.getCurrentBoard();
  },

  allowsSubtasks() {
@@ -788,7 +786,7 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    return Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
@@ -797,10 +795,11 @@ BlazeComponent.extendComponent({
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
+    return ret;
  },

  lists() {
-    return Lists.find(
+    return ReactiveCache.getLists(
      {
        boardId: this.currentBoard._id,
        archived: false,
@@ -812,7 +811,7 @@ BlazeComponent.extendComponent({
  },

  hasLists() {
-    return this.lists().count() > 0;
+    return this.lists().length > 0;
  },

  isListSelected() {
@@ -891,7 +890,7 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+    this.currentBoard = Utils.getCurrentBoard();
  },

  allowsReceivedDate() {
@@ -986,7 +985,7 @@ BlazeComponent.extendComponent({
  },

  boards() {
-    return Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
@@ -995,10 +994,11 @@ BlazeComponent.extendComponent({
        sort: { sort: 1 /* boards default sorting */ },
      },
    );
+    return ret;
  },

  lists() {
-    return Lists.find(
+    return ReactiveCache.getLists(
      {
        boardId: this.currentBoard._id,
        archived: false,
@@ -1010,7 +1010,7 @@ BlazeComponent.extendComponent({
  },

  hasLists() {
-    return this.lists().count() > 0;
+    return this.lists().length > 0;
  },

  isListSelected() {
@@ -1326,7 +1326,7 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+    this.currentBoard = Utils.getCurrentBoard();
  },

  allowsDescriptionTextOnMinicard() {
@@ -1346,7 +1346,7 @@ BlazeComponent.extendComponent({
  },

 lists() {
-    return Lists.find(
+    return ReactiveCache.getLists(
      {
        boardId: this.currentBoard._id,
        archived: false,
@@ -1358,7 +1358,7 @@ BlazeComponent.extendComponent({
  },

  hasLists() {
-    return this.lists().count() > 0;
+    return this.lists().length > 0;
  },

  isListSelected() {
@@ -1452,7 +1452,7 @@ BlazeComponent.extendComponent({

  isBoardMember() {
    const userId = this.currentData().__originalId;
-    const user = Users.findOne(userId);
+    const user = ReactiveCache.getUser(userId);
    return user && user.isBoardMember();
  },

@@ -1492,7 +1492,7 @@ BlazeComponent.extendComponent({
        },
        'click .js-select-member'() {
          const userId = this.currentData().__originalId;
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
          if (!currentBoard.hasMember(userId)) {
            this.inviteUser(userId);
          }
@@ -1548,7 +1548,7 @@ BlazeComponent.extendComponent({
          this.setError('');
        },
        'change #jsBoardOrgs'() {
-          let currentBoard = Boards.findOne(Session.get('currentBoard'));
+          let currentBoard = Utils.getCurrentBoard();
          let selectElt = document.getElementById("jsBoardOrgs");
          let selectedOrgId = selectElt.options[selectElt.selectedIndex].value;
          let selectedOrgDisplayName = selectElt.options[selectElt.selectedIndex].text;
@@ -1580,8 +1580,8 @@ BlazeComponent.extendComponent({

 Template.addBoardOrgPopup.helpers({
  orgsDatas() {
-    let orgs = Org.find({}, {sort: { orgDisplayName: 1 }});
-    return orgs;
+    let ret = ReactiveCache.getOrgs({}, {sort: { orgDisplayName: 1 }});
+    return ret;
  },
 });

@@ -1622,7 +1622,7 @@ BlazeComponent.extendComponent({
        },
        'click #leaveBoardBtn'(){
          let stringOrgId = document.getElementById('hideOrgId').value;
-          let currentBoard = Boards.findOne(Session.get('currentBoard'));
+          let currentBoard = Utils.getCurrentBoard();
          let boardOrganizations = [];
          if(currentBoard.orgs !== undefined){
            for(let i = 0; i < currentBoard.orgs.length; i++){
@@ -1646,7 +1646,7 @@ BlazeComponent.extendComponent({

 Template.removeBoardOrgPopup.helpers({
  org() {
-    return Org.findOne(this.orgId);
+    return ReactiveCache.getOrg(this.orgId);
  },
 });

@@ -1693,7 +1693,7 @@ BlazeComponent.extendComponent({
          this.setError('');
        },
        'change #jsBoardTeams'() {
-          let currentBoard = Boards.findOne(Session.get('currentBoard'));
+          let currentBoard = Utils.getCurrentBoard();
          let selectElt = document.getElementById("jsBoardTeams");
          let selectedTeamId = selectElt.options[selectElt.selectedIndex].value;
          let selectedTeamDisplayName = selectElt.options[selectElt.selectedIndex].text;
@@ -1718,13 +1718,13 @@ BlazeComponent.extendComponent({
                "teams.teamId": { $in: boardTeams.map(t => t.teamId) },
              };

-              const boardTeamUsers = Users.find(query, {
+              const boardTeamUsers = ReactiveCache.getUsers(query, {
                sort: { sort: 1 },
              });

              if(boardTeams !== undefined && boardTeams.length > 0){
                let index;
-                if(boardTeamUsers && boardTeamUsers.count() > 0){
+                if (boardTeamUsers && boardTeamUsers.length > 0) {
                  boardTeamUsers.forEach((u) => {
                    index = members.findIndex(function(m){ return m.userId == u._id});
                    if(index == -1){
@@ -1753,8 +1753,8 @@ BlazeComponent.extendComponent({

 Template.addBoardTeamPopup.helpers({
  teamsDatas() {
-    let teams = Team.find({}, {sort: { teamDisplayName: 1 }});
-    return teams;
+    let ret = ReactiveCache.getTeams({}, {sort: { teamDisplayName: 1 }});
+    return ret;
  },
 });

@@ -1802,7 +1802,7 @@ BlazeComponent.extendComponent({
        },
        'click #leaveBoardTeamBtn'(){
          let stringTeamId = document.getElementById('hideTeamId').value;
-          let currentBoard = Boards.findOne(Session.get('currentBoard'));
+          let currentBoard = Utils.getCurrentBoard();
          let boardTeams = [];
          if(currentBoard.teams !== undefined){
            for(let i = 0; i < currentBoard.teams.length; i++){
@@ -1817,13 +1817,13 @@ BlazeComponent.extendComponent({
            "teams.teamId": stringTeamId
          };

-          const boardTeamUsers = Users.find(query, {
+          const boardTeamUsers = ReactiveCache.getUsers(query, {
            sort: { sort: 1 },
          });

          if(currentBoard.teams !== undefined && currentBoard.teams.length > 0){
            let index;
-            if(boardTeamUsers && boardTeamUsers.count() > 0){
+            if (boardTeamUsers && boardTeamUsers.length > 0) {
              boardTeamUsers.forEach((u) => {
                index = members.findIndex(function(m){ return m.userId == u._id});
                if(index !== -1 && (u.isAdmin === undefined || u.isAdmin == false)){
@@ -1847,7 +1847,7 @@ BlazeComponent.extendComponent({

 Template.removeBoardTeamPopup.helpers({
  team() {
-    return Team.findOne(this.teamId);
+    return ReactiveCache.getTeam(this.teamId);
  },
 });

@@ -1855,7 +1855,7 @@ Template.changePermissionsPopup.events({
  'click .js-set-admin, click .js-set-normal, click .js-set-no-comments, click .js-set-comment-only, click .js-set-worker'(
    event,
  ) {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    const memberId = this.userId;
    const isAdmin = $(event.currentTarget).hasClass('js-set-admin');
    const isCommentOnly = $(event.currentTarget).hasClass(
@@ -1876,12 +1876,12 @@ Template.changePermissionsPopup.events({

 Template.changePermissionsPopup.helpers({
  isAdmin() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return currentBoard.hasAdmin(this.userId);
  },

  isNormal() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return (
      !currentBoard.hasAdmin(this.userId) &&
      !currentBoard.hasNoComments(this.userId) &&
@@ -1891,7 +1891,7 @@ Template.changePermissionsPopup.helpers({
  },

  isNoComments() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return (
      !currentBoard.hasAdmin(this.userId) &&
      currentBoard.hasNoComments(this.userId)
@@ -1899,7 +1899,7 @@ Template.changePermissionsPopup.helpers({
  },

  isCommentOnly() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return (
      !currentBoard.hasAdmin(this.userId) &&
      currentBoard.hasCommentOnly(this.userId)
@@ -1907,14 +1907,14 @@ Template.changePermissionsPopup.helpers({
  },

  isWorker() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return (
      !currentBoard.hasAdmin(this.userId) && currentBoard.hasWorker(this.userId)
    );
  },

  isLastAdmin() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return (
      currentBoard.hasAdmin(this.userId) && currentBoard.activeAdmins() === 1
    );
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 //archivedRequested = false;
@@ -33,7 +34,7 @@ BlazeComponent.extendComponent({
  },

  archivedCards() {
-    return Cards.find(
+    const ret = ReactiveCache.getCards(
      {
        archived: true,
        boardId: Session.get('currentBoard'),
@@ -42,10 +43,11 @@ BlazeComponent.extendComponent({
        sort: { archivedAt: -1, modifiedAt: -1 },
      },
    );
+    return ret;
  },

  archivedLists() {
-    return Lists.find(
+    return ReactiveCache.getLists(
      {
        archived: true,
        boardId: Session.get('currentBoard'),
@@ -57,7 +59,7 @@ BlazeComponent.extendComponent({
  },

  archivedSwimlanes() {
-    return Swimlanes.find(
+    return ReactiveCache.getSwimlanes(
      {
        archived: true,
        boardId: Session.get('currentBoard'),
@@ -159,10 +161,10 @@ BlazeComponent.extendComponent({

 Template.archivesSidebar.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
  isWorker() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return (
      !currentBoard.hasAdmin(this.userId) && currentBoard.hasWorker(this.userId)
    );
@@ -1,10 +1,12 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 BlazeComponent.extendComponent({
  customFields() {
-    return CustomFields.find({
+    const ret = ReactiveCache.getCustomFields({
      boardIds: { $in: [Session.get('currentBoard')] },
    });
+    return ret;
  },

  events() {
@@ -275,7 +277,7 @@ const CreateCustomFieldPopup = BlazeComponent.extendComponent({
        'click .js-delete-custom-field': Popup.afterConfirm(
          'deleteCustomField',
          function() {
-            const customField = CustomFields.findOne(this._id);
+            const customField = ReactiveCache.getCustomField(this._id);
            if (customField.boardIds.length > 1) {
              CustomFields.update(customField._id, {
                $pull: {
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 const subManager = new SubsManager();

 BlazeComponent.extendComponent({
@@ -93,7 +95,7 @@ BlazeComponent.extendComponent({
        },
        'click .js-filter-to-selection'(evt) {
          evt.preventDefault();
-          const selectedCards = Cards.find(Filter.mongoSelector()).map(c => {
+          const selectedCards = ReactiveCache.getCards(Filter.mongoSelector()).map(c => {
            return c._id;
          });
          MultiSelection.add(selectedCards);
@@ -104,14 +106,14 @@ BlazeComponent.extendComponent({
 }).register('filterSidebar');

 function mutateSelectedCards(mutationName, ...args) {
-  Cards.find(MultiSelection.getMongoSelector(), {sort: ['sort']}).forEach(card => {
+  ReactiveCache.getCards(MultiSelection.getMongoSelector(), {sort: ['sort']}).forEach(card => {
    card[mutationName](...args);
  });
 }

 BlazeComponent.extendComponent({
  mapSelection(kind, _id) {
-    return Cards.find(MultiSelection.getMongoSelector(), {sort: ['sort']}).map(card => {
+    return ReactiveCache.getCards(MultiSelection.getMongoSelector(), {sort: ['sort']}).map(card => {
      const methodName = kind === 'label' ? 'hasLabel' : 'isAssigned';
      return card[methodName](_id);
    });
@@ -171,10 +173,10 @@ BlazeComponent.extendComponent({

 Template.multiselectionSidebar.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
  isCommentOnly() {
-    return Meteor.user().isCommentOnly();
+    return ReactiveCache.getCurrentUser().isCommentOnly();
  },
 });

@@ -4,12 +4,12 @@ BlazeComponent.extendComponent({
  },

  cards() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return currentBoard.searchCards(this.term.get());
  },

  lists() {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    return currentBoard.searchLists(this.term.get());
  },

@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 const { calculateIndexData } = Utils;

 let swimlaneColors;
@@ -30,7 +31,7 @@ BlazeComponent.extendComponent({

 Template.swimlaneFixedHeader.helpers({
  isBoardAdmin() {
-    return Meteor.user().isBoardAdmin();
+    return ReactiveCache.getCurrentUser().isBoardAdmin();
  },
 });

@@ -47,7 +48,7 @@ Template.swimlaneActionPopup.events({

 Template.swimlaneActionPopup.events({
  isCommentOnly() {
-    return Meteor.user().isCommentOnly();
+    return ReactiveCache.getCurrentUser().isCommentOnly();
  },
 });

@@ -61,7 +62,7 @@ BlazeComponent.extendComponent({
      {
        submit(event) {
          event.preventDefault();
-          const currentBoard = Boards.findOne(Session.get('currentBoard'));
+          const currentBoard = Utils.getCurrentBoard();
          const nextSwimlane = currentBoard.nextSwimlane(this.currentSwimlane);
          const titleInput = this.find('.swimlane-name-input');
          const title = titleInput.value.trim();
@@ -1,7 +1,8 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 const { calculateIndex } = Utils;

 function currentListIsInThisSwimlane(swimlaneId) {
-  const currentList = Lists.findOne(Session.get('currentList'));
+  const currentList = Utils.getCurrentList();
  return (
    currentList &&
    (currentList.swimlaneId === swimlaneId || currentList.swimlaneId === '')
@@ -10,7 +11,7 @@ function currentListIsInThisSwimlane(swimlaneId) {

 function currentCardIsInThisList(listId, swimlaneId) {
  const currentCard = Utils.getCurrentCard();
-  //const currentUser = Meteor.user();
+  //const currentUser = ReactiveCache.getCurrentUser();
  if (
    //currentUser &&
    //currentUser.profile &&
@@ -104,15 +105,6 @@ function initSortable(boardComponent, $listsDom) {
    },
  });

-  //function userIsMember() {
-  //  return (
-  //    Meteor.user() &&
-  //    Meteor.user().isBoardMember() &&
-  //    !Meteor.user().isCommentOnly() &&
-  //    !Meteor.user().isWorker()
-  //  );
-  //}
-
  boardComponent.autorun(() => {
    if (Utils.isTouchScreenOrShowDesktopDragHandles()) {
      $listsDom.sortable({
@@ -129,11 +121,7 @@ function initSortable(boardComponent, $listsDom) {
      $listsDom.sortable(
        'option',
        'disabled',
-        // Disable drag-dropping when user is not member/is worker
-        //!userIsMember() || Meteor.user().isWorker(),
-        !Meteor.user() || !Meteor.user().isBoardAdmin(),
-        // Not disable drag-dropping while in multi-selection mode
-        // MultiSelection.isActive() || !userIsMember(),
+        !ReactiveCache.getCurrentUser()?.isBoardAdmin(),
      );
    }
  });
@@ -182,7 +170,7 @@ BlazeComponent.extendComponent({
        .parentComponent()
        .data()._id;
      const cards = list.cards(swimlaneId);
-      if (cards.count() === 0) {
+      if (cards.length === 0) {
        return false;
      }
    }
@@ -239,7 +227,7 @@ BlazeComponent.extendComponent({

 BlazeComponent.extendComponent({
  onCreated() {
-    this.currentBoard = Boards.findOne(Session.get('currentBoard'));
+    this.currentBoard = Utils.getCurrentBoard();
    this.isListTemplatesSwimlane =
      this.currentBoard.isTemplatesBoard() &&
      this.currentData().isListTemplatesSwimlane();
@@ -263,7 +251,7 @@ BlazeComponent.extendComponent({
          if (lastList) {
            const positionInput = this.find('.list-position-input');
            const position = positionInput.value.trim();
-            const ret = Lists.findOne({ boardId: Session.get('currentBoard'), _id: position, archived: false })
+            const ret = ReactiveCache.getList({ boardId: Utils.getCurrentBoardId(), _id: position, archived: false })
            sortIndex = parseInt(JSON.stringify(ret['sort']))
            sortIndex = sortIndex+1
          } else {
@@ -294,12 +282,6 @@ BlazeComponent.extendComponent({
 Template.swimlane.helpers({
  canSeeAddList() {
    return Meteor.user().isBoardAdmin();
-    /*
-      Meteor.user() &&
-      Meteor.user().isBoardMember() &&
-      !Meteor.user().isCommentOnly() &&
-      !Meteor.user().isWorker()
-      */
  },
 });

@@ -324,7 +306,7 @@ BlazeComponent.extendComponent({
        .parentComponent()
        .data()._id;
      const cards = list.cards(swimlaneId);
-      if (cards.count() === 0) {
+      if (cards.length === 0) {
        return false;
      }
    }
@@ -350,7 +332,7 @@ class MoveSwimlaneComponent extends BlazeComponent {
  }

  board() {
-    return Boards.findOne(Session.get('currentBoard'));
+    return Utils.getCurrentBoard();
  }

  toBoardsSelector() {
@@ -363,14 +345,14 @@ class MoveSwimlaneComponent extends BlazeComponent {
  }

  toBoards() {
-    return Boards.find(this.toBoardsSelector(), { sort: { title: 1 } });
+    const ret = ReactiveCache.getBoards(this.toBoardsSelector(), { sort: { title: 1 } });
+    return ret;
  }

  events() {
    return [
      {
        'click .js-done'() {
-          // const swimlane = Swimlanes.findOne(this.currentSwimlane._id);
          const bSelect = $('.js-select-boards')[0];
          let boardId;
          if (bSelect) {
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import Cards from '/models/cards';
 import Avatars from '/models/avatars';
 import Users from '/models/users';
@@ -6,7 +7,7 @@ import Team from '/models/team';

 Template.userAvatar.helpers({
  userData() {
-    return Users.findOne(this.userId, {
+    return ReactiveCache.getUser(this.userId, {
      fields: {
        profile: 1,
        username: 1,
@@ -15,13 +16,13 @@ Template.userAvatar.helpers({
  },

  memberType() {
-    const user = Users.findOne(this.userId);
+    const user = ReactiveCache.getUser(this.userId);
    return user && user.isBoardAdmin() ? 'admin' : 'normal';
  },

 /*
  presenceStatusClassName() {
-    const user = Users.findOne(this.userId);
+    const user = ReactiveCache.getUser(this.userId);
    const userPresence = presences.findOne({ userId: this.userId });
    if (user && user.isInvitedTo(Session.get('currentBoard'))) return 'pending';
    else if (!userPresence) return 'disconnected';
@@ -35,12 +36,12 @@ Template.userAvatar.helpers({

 Template.userAvatarInitials.helpers({
  initials() {
-    const user = Users.findOne(this.userId);
+    const user = ReactiveCache.getUser(this.userId);
    return user && user.getInitials();
  },

  viewPortWidth() {
-    const user = Users.findOne(this.userId);
+    const user = ReactiveCache.getUser(this.userId);
    return ((user && user.getInitials().length) || 1) * 12;
  },
 });
@@ -88,21 +89,18 @@ BlazeComponent.extendComponent({

 Template.boardOrgRow.helpers({
  orgData() {
-    return Org.findOne(this.orgId);
-  },
-  currentUser(){
-    return Meteor.user();
+    return ReactiveCache.getOrg(this.orgId);
  },
 });

 Template.boardOrgName.helpers({
  orgName() {
-    const org = Org.findOne(this.orgId);
+    const org = ReactiveCache.getOrg(this.orgId);
    return org && org.orgDisplayName;
  },

  orgViewPortWidth() {
-    const org = Org.findOne(this.orgId);
+    const org = ReactiveCache.getOrg(this.orgId);
    return ((org && org.orgDisplayName.length) || 1) * 12;
  },
 });
@@ -150,21 +148,18 @@ BlazeComponent.extendComponent({

 Template.boardTeamRow.helpers({
  teamData() {
-    return Team.findOne(this.teamId);
-  },
-  currentUser(){
-    return Meteor.user();
+    return ReactiveCache.getTeam(this.teamId);
  },
 });

 Template.boardTeamName.helpers({
  teamName() {
-    const team = Team.findOne(this.teamId);
+    const team = ReactiveCache.getTeam(this.teamId);
    return team && team.teamDisplayName;
  },

  teamViewPortWidth() {
-    const team = Team.findOne(this.teamId);
+    const team = ReactiveCache.getTeam(this.teamId);
    return ((team && team.teamDisplayName.length) || 1) * 12;
  },
 });
@@ -177,24 +172,25 @@ BlazeComponent.extendComponent({
  },

  uploadedAvatars() {
-    return Avatars.find({ userId: Meteor.userId() }).each();
+    const ret = ReactiveCache.getAvatars({ userId: Meteor.userId() }, {}, true).each();
+    return ret;
  },

  isSelected() {
-    const userProfile = Meteor.user().profile;
+    const userProfile = ReactiveCache.getCurrentUser().profile;
    const avatarUrl = userProfile && userProfile.avatarUrl;
    const currentAvatarUrl = `${this.currentData().link()}?auth=false&brokenIsFine=true`;
    return avatarUrl === currentAvatarUrl;
  },

  noAvatarUrl() {
-    const userProfile = Meteor.user().profile;
+    const userProfile = ReactiveCache.getCurrentUser().profile;
    const avatarUrl = userProfile && userProfile.avatarUrl;
    return !avatarUrl;
  },

  setAvatar(avatarUrl) {
-    Meteor.user().setAvatarUrl(avatarUrl);
+    ReactiveCache.getCurrentUser().setAvatarUrl(avatarUrl);
  },

  setError(error) {
@@ -248,7 +244,7 @@ Template.cardMembersPopup.helpers({
  },

  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
 });

@@ -263,13 +259,13 @@ Template.cardMembersPopup.events({

 Template.cardMemberPopup.helpers({
  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
 });

 Template.cardMemberPopup.events({
  'click .js-remove-member'() {
-    Cards.findOne(this.cardId).unassignMember(this.userId);
+    ReactiveCache.getCard(this.cardId).unassignMember(this.userId);
    Popup.back();
  },
  'click .js-edit-profile': Popup.open('editProfile'),
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 Template.headerUserBar.events({
@@ -13,27 +14,27 @@ BlazeComponent.extendComponent({

 Template.memberMenuPopup.helpers({
  templatesBoardId() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
-      return Meteor.user().getTemplatesBoardId();
+      return currentUser.getTemplatesBoardId();
    } else {
      // No need to getTemplatesBoardId on public board
      return false;
    }
  },
  templatesBoardSlug() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
-      return Meteor.user().getTemplatesBoardSlug();
+      return currentUser.getTemplatesBoardSlug();
    } else {
      // No need to getTemplatesBoardSlug() on public board
      return false;
    }
  },
  isSameDomainNameSettingValue(){
-    const currSett = Settings.findOne();
+    const currSett = ReactiveCache.getCurrentSetting();
    if(currSett && currSett != undefined && currSett.disableRegistration && currSett.mailDomainName !== undefined && currSett.mailDomainName != ""){
-      currentUser = Meteor.user();
+      currentUser = ReactiveCache.getCurrentUser();
      if (currentUser) {
        let found = false;
        for(let i = 0; i < currentUser.emails.length; i++) {
@@ -51,7 +52,7 @@ Template.memberMenuPopup.helpers({
      return false;
  },
  isNotOAuth2AuthenticationMethod(){
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return currentUser.authenticationMethod.toLowerCase() != 'oauth2';
    } else {
@@ -140,12 +141,6 @@ Template.invitePeoplePopup.events({
  },
 });

-Template.invitePeoplePopup.helpers({
-  currentSetting() {
-    return Settings.findOne();
-  },
-});
-
 Template.editProfilePopup.helpers({
  allowEmailChange() {
    Meteor.call('AccountSettings.allowEmailChange', (_, result) => {
@@ -191,9 +186,9 @@ Template.editProfilePopup.events({
        'profile.initials': initials,
      },
    });
-    isChangeUserName = username !== Meteor.user().username;
+    isChangeUserName = username !== ReactiveCache.getCurrentUser().username;
    isChangeEmail =
-      email.toLowerCase() !== Meteor.user().emails[0].address.toLowerCase();
+      email.toLowerCase() !== ReactiveCache.getCurrentUser().emails[0].address.toLowerCase();
    if (isChangeUserName && isChangeEmail) {
      Meteor.call(
        'setUsernameAndEmail',
@@ -288,7 +283,7 @@ Template.changeLanguagePopup.events({

 Template.changeSettingsPopup.helpers({
  hiddenSystemMessages() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).hasHiddenSystemMessages;
    } else if (window.localStorage.getItem('hasHiddenSystemMessages')) {
@@ -298,7 +293,7 @@ Template.changeSettingsPopup.helpers({
    }
  },
  rescueCardDescription() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).rescueCardDescription;
    } else if (window.localStorage.getItem('rescueCardDescription')) {
@@ -308,9 +303,9 @@ Template.changeSettingsPopup.helpers({
    }
  },
  showCardsCountAt() {
-    currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
-      return Meteor.user().getLimitToShowCardsCount();
+      return currentUser.getLimitToShowCardsCount();
    } else {
      return window.localStorage.getItem('limitToShowCardsCount');
    }
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { Blaze } from 'meteor/blaze';
 import { Session } from 'meteor/session';
 import moment from 'moment/min/moment-with-locales';
@@ -13,15 +14,21 @@ Blaze.registerHelper('currentCard', () => {
 });

 Blaze.registerHelper('currentList', () => {
-  const listId = Session.get('currentList');
-  if (listId) {
-    return Lists.findOne(listId);
-  } else {
-    return null;
-  }
+  const ret = Utils.getCurrentList();
+  return ret;
 });

-Blaze.registerHelper('getUser', userId => Users.findOne(userId));
+Blaze.registerHelper('currentSetting', () => {
+  const ret = ReactiveCache.getCurrentSetting();
+  return ret;
+});
+
+Blaze.registerHelper('currentUser', () => {
+  const ret = ReactiveCache.getCurrentUser();
+  return ret;
+});
+
+Blaze.registerHelper('getUser', userId => ReactiveCache.getUser(userId));

 Blaze.registerHelper('concat', (...args) => args.slice(0, -1).join(''));

@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import Cards from '../../models/cards';
 import SessionData from '../../models/usersessiondata';
@@ -61,8 +62,8 @@ export class CardSearchPagedComponent extends BlazeComponent {
  }

  getSessionData(sessionId) {
-    return SessionData.findOne({
-      sessionId: sessionId ? sessionId : SessionData.getSessionId(),
+    return ReactiveCache.getSessionData({
+      sessionId: sessionId || SessionData.getSessionId(),
    });
  }

@@ -74,7 +75,7 @@ export class CardSearchPagedComponent extends BlazeComponent {
    console.log('session data:', this.sessionData);
    const cards = [];
    this.sessionData.cards.forEach(cardId => {
-      cards.push(Cards.findOne({ _id: cardId }));
+      cards.push(ReactiveCache.getCard(cardId));
    });
    this.queryErrors = this.sessionData.errors;
    if (this.queryErrors.length) {
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import moment from 'moment/min/moment-with-locales';

@@ -22,7 +23,7 @@ export class DatePicker extends BlazeComponent {
  }

  startDayOfWeek() {
-    const currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return currentUser.getStartDayOfWeek();
    } else {
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 export class DialogWithBoardSwimlaneList extends BlazeComponent {
  /** returns the card dialog options
   * @return Object with properties { boardId, swimlaneId, listId }
@@ -52,26 +54,26 @@ export class DialogWithBoardSwimlaneList extends BlazeComponent {
      }
    }
    this.getBoardData(this.selectedBoardId.get());
-    if (!this.selectedSwimlaneId.get() || !Swimlanes.findOne({_id: this.selectedSwimlaneId.get(), boardId: this.selectedBoardId.get()})) {
+    if (!this.selectedSwimlaneId.get() || !ReactiveCache.getSwimlane({_id: this.selectedSwimlaneId.get(), boardId: this.selectedBoardId.get()})) {
      this.setFirstSwimlaneId();
    }
-    if (!this.selectedListId.get() || !Lists.findOne({_id: this.selectedListId.get(), boardId: this.selectedBoardId.get()})) {
+    if (!this.selectedListId.get() || !ReactiveCache.getList({_id: this.selectedListId.get(), boardId: this.selectedBoardId.get()})) {
      this.setFirstListId();
    }
  }
  /** sets the first swimlane id */
  setFirstSwimlaneId() {
    try {
-      const board = Boards.findOne(this.selectedBoardId.get());
-      const swimlaneId = board.swimlanes().fetch()[0]._id;
+      const board = ReactiveCache.getBoard(this.selectedBoardId.get());
+      const swimlaneId = board.swimlanes()[0]._id;
      this.selectedSwimlaneId.set(swimlaneId);
    } catch (e) {}
  }
  /** sets the first list id */
  setFirstListId() {
    try {
-      const board = Boards.findOne(this.selectedBoardId.get());
-      const listId = board.lists().fetch()[0]._id;
+      const board = ReactiveCache.getBoard(this.selectedBoardId.get());
+      const listId = board.lists()[0]._id;
      this.selectedListId.set(listId);
    } catch (e) {}
  }
@@ -105,11 +107,11 @@ export class DialogWithBoardSwimlaneList extends BlazeComponent {

  /** returns all available board */
  boards() {
-    const ret = Boards.find(
+    const ret = ReactiveCache.getBoards(
      {
        archived: false,
        'members.userId': Meteor.userId(),
-        _id: { $ne: Meteor.user().getTemplatesBoardId() },
+        _id: { $ne: ReactiveCache.getCurrentUser().getTemplatesBoardId() },
      },
      {
        sort: { sort: 1 },
@@ -120,14 +122,14 @@ export class DialogWithBoardSwimlaneList extends BlazeComponent {

  /** returns all available swimlanes of the current board */
  swimlanes() {
-    const board = Boards.findOne(this.selectedBoardId.get());
+    const board = ReactiveCache.getBoard(this.selectedBoardId.get());
    const ret = board.swimlanes();
    return ret;
  }

  /** returns all available lists of the current board */
  lists() {
-    const board = Boards.findOne(this.selectedBoardId.get());
+    const board = ReactiveCache.getBoard(this.selectedBoardId.get());
    const ret = board.lists();
    return ret;
  }
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { DialogWithBoardSwimlaneList } from '/client/lib/dialogWithBoardSwimlaneList';

 export class DialogWithBoardSwimlaneListCard extends DialogWithBoardSwimlaneList {
@@ -22,7 +23,7 @@ export class DialogWithBoardSwimlaneListCard extends DialogWithBoardSwimlaneList

  /** returns all available cards of the current list */
  cards() {
-    const list = Lists.findOne(this.selectedListId.get());
+    const list = ReactiveCache.getList(this.selectedListId.get());
    let ret = [];
    if (list) {
      ret = list.cards(this.selectedSwimlaneId.get());
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import moment from 'moment/min/moment-with-locales';

 // Filtered view manager
@@ -107,7 +108,7 @@ class DateFilter {
    // preferred starting day of the week. This date should be added
    // to the moment start of week to get the real start of week date.
    // The default is 1, meaning Monday.
-    const currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    const weekStartDay = currentUser ? currentUser.getStartDayOfWeek() : 1;

    if (week === 'this') {
@@ -371,14 +372,14 @@ class AdvancedFilter {
  }

  _fieldNameToId(field) {
-    const found = CustomFields.findOne({
+    const found = ReactiveCache.getCustomField({
      name: field,
    });
    return found._id;
  }

  _fieldValueToId(field, value) {
-    const found = CustomFields.findOne({
+    const found = ReactiveCache.getCustomField({
      name: field,
    });
    if (
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';

 // We save the user language preference in the user profile, and use that to set
@@ -5,7 +6,7 @@ import { TAPi18n } from '/imports/i18n';
 // information provided by the browser, and default to english.

 Meteor.startup(async () => {
-  let currentUser = Meteor.user();
+  let currentUser = ReactiveCache.getCurrentUser();
  // If we're still logging in, wait (#4967)
  if (!currentUser && Meteor.loggingIn()) {
    await new Promise((resolve) => {
@@ -15,7 +16,7 @@ Meteor.startup(async () => {
        }
      });
    });
-    currentUser = Meteor.user();
+    currentUser = ReactiveCache.getCurrentUser();
  }
  // Select first available language
  const [language] = [
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 // XXX There is no reason to define these shortcuts globally, they should be
 // attached to a template (most of them will go in the `board` template).

@@ -76,14 +78,14 @@ Mousetrap.bind(numbArray, (evt, key) => {
    return;
  }
  const currentBoardId = Session.get('currentBoard');
-  board = Boards.findOne(currentBoardId);
+  board = ReactiveCache.getBoard(currentBoardId);
  labels = board.labels;
  if(MultiSelection.isActive())
  {
    const cardIds = MultiSelection.getSelectedCardIds();
    for (const cardId of cardIds)
    {
-      card = Cards.findOne(cardId);
+      card = ReactiveCache.getCard(cardId);
      if(num <= board.labels.length)
      {
        card.removeLabel(labels[num-1]["_id"]);
@@ -100,14 +102,14 @@ Mousetrap.bind(numArray, (evt, key) => {
  if (currentUserId === null) {
    return;
  }
-  board = Boards.findOne(currentBoardId);
+  board = ReactiveCache.getBoard(currentBoardId);
  labels = board.labels;
-  if(MultiSelection.isActive() && Meteor.user().isBoardMember())
+  if(MultiSelection.isActive() && ReactiveCache.getCurrentUser().isBoardMember())
  {
    const cardIds = MultiSelection.getSelectedCardIds();
    for (const cardId of cardIds)
    {
-      card = Cards.findOne(cardId);
+      card = ReactiveCache.getCard(cardId);
      if(num <= board.labels.length)
      {
        card.addLabel(labels[num-1]["_id"]);
@@ -120,8 +122,8 @@ Mousetrap.bind(numArray, (evt, key) => {
  if (!cardId) {
    return;
  }
-  if (Meteor.user().isBoardMember()) {
-    const card = Cards.findOne(cardId);
+  if (ReactiveCache.getCurrentUser().isBoardMember()) {
+    const card = ReactiveCache.getCard(cardId);
    if(num <= board.labels.length)
    {
      card.toggleLabel(labels[num-1]["_id"]);
@@ -140,8 +142,8 @@ Mousetrap.bind('space', evt => {
    return;
  }

-  if (Meteor.user().isBoardMember()) {
-    const card = Cards.findOne(cardId);
+  if (ReactiveCache.getCurrentUser().isBoardMember()) {
+    const card = ReactiveCache.getCard(cardId);
    card.toggleMember(currentUserId);
    // We should prevent scrolling in card when spacebar is clicked
    // This should do it according to Mousetrap docs, but it doesn't
@@ -160,12 +162,8 @@ Mousetrap.bind('c', evt => {
    return;
  }

-  if (
-    Meteor.user().isBoardMember() &&
-    !Meteor.user().isCommentOnly() &&
-    !Meteor.user().isWorker()
-  ) {
-    const card = Cards.findOne(cardId);
+  if (Utils.canModifyBoard()) {
+    const card = ReactiveCache.getCard(cardId);
    card.archive();
    // We should prevent scrolling in card when spacebar is clicked
    // This should do it according to Mousetrap docs, but it doesn't
@@ -1,19 +1,21 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 function getCardsBetween(idA, idB) {
  function pluckId(doc) {
    return doc._id;
  }

  function getListsStrictlyBetween(id1, id2) {
-    return Lists.find({
+    return ReactiveCache.getLists({
      $and: [
-        { sort: { $gt: Lists.findOne(id1).sort } },
-        { sort: { $lt: Lists.findOne(id2).sort } },
+        { sort: { $gt: ReactiveCache.getList(id1).sort } },
+        { sort: { $lt: ReactiveCache.getList(id2).sort } },
      ],
      archived: false,
    }).map(pluckId);
  }

-  const cards = _.sortBy([Cards.findOne(idA), Cards.findOne(idB)], c => {
+  const cards = _.sortBy([ReactiveCache.getCard(idA), ReactiveCache.getCard(idB)], c => {
    return c.sort;
  });

@@ -48,7 +50,7 @@ function getCardsBetween(idA, idB) {
    };
  }

-  return Cards.find(Filter.mongoSelector(selector)).map(pluckId);
+  return ReactiveCache.getCards(Filter.mongoSelector(selector)).map(pluckId);
 }

 MultiSelection = {
@@ -77,7 +79,7 @@ MultiSelection = {
  },

  count() {
-    return Cards.find(this.getMongoSelector()).count();
+    return ReactiveCache.getCards(this.getMongoSelector()).length;
  },

  isEmpty() {
@@ -1,19 +1,17 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 Meteor.subscribe('setting');

 import { ALLOWED_WAIT_SPINNERS } from '/config/const';

 export class Spinner extends BlazeComponent {
-  currentSettings() {
-    return Settings.findOne();
-  }
-
  getSpinnerName() {
    let ret = 'Bounce';
    let defaultWaitSpinner = Meteor.settings.public.WAIT_SPINNER;
    if (defaultWaitSpinner && ALLOWED_WAIT_SPINNERS.includes(defaultWaitSpinner)) {
      ret = defaultWaitSpinner;
    }
-    let settings = this.currentSettings();
+    let settings = ReactiveCache.getCurrentSetting();

    if (settings && settings.spinnerName) {
      ret = settings.spinnerName;
@@ -1,6 +1,8 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 Utils = {
  setBackgroundImage(url) {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    if (currentBoard.backgroundImageURL !== undefined) {
      $(".board-wrapper,.board-wrapper .board-canvas").css({"background":"url(" + currentBoard.backgroundImageURL + ")","background-size":"cover"});
      $(".swimlane,.swimlane .list,.swimlane .list .list-body,.swimlane .list:first-child .list-body").css({"background-color":"transparent"});
@@ -31,26 +33,38 @@ Utils = {
    const ret = Session.get('popupCardId');
    return ret;
  },
+  getCurrentListId() {
+    const ret = Session.get('currentList');
+    return ret;
+  },
  /** returns the current board
   * <li> returns the current board or the board of the popup card if set
   */
  getCurrentBoard() {
    const boardId = Utils.getCurrentBoardId();
-    const ret = Boards.findOne(boardId);
+    const ret = ReactiveCache.getBoard(boardId);
    return ret;
  },
  getCurrentCard(ignorePopupCard) {
    const cardId = Utils.getCurrentCardId(ignorePopupCard);
-    const ret = Cards.findOne(cardId);
+    const ret = ReactiveCache.getCard(cardId);
+    return ret;
+  },
+  getCurrentList() {
+    const listId = this.getCurrentListId();
+    let ret = null;
+    if (listId) {
+      ret = ReactiveCache.getList(listId);
+    }
    return ret;
  },
  getPopupCard() {
    const cardId = Utils.getPopupCardId();
-    const ret = Cards.findOne(cardId);
+    const ret = ReactiveCache.getCard(cardId);
    return ret;
  },
  canModifyCard() {
-    const currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    const ret = (
      currentUser &&
      currentUser.isBoardMember() &&
@@ -60,7 +74,7 @@ Utils = {
    return ret;
  },
  canModifyBoard() {
-    const currentUser = Meteor.user();
+    const currentUser = ReactiveCache.getCurrentUser();
    const ret = (
      currentUser &&
      currentUser.isBoardMember() &&
@@ -76,9 +90,9 @@ Utils = {
    window.location.reload();
  },
  setBoardView(view) {
-    currentUser = Meteor.user();
+    currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
-      Meteor.user().setBoardView(view);
+      ReactiveCache.getCurrentUser().setBoardView(view);
    } else if (view === 'board-view-swimlanes') {
      window.localStorage.setItem('boardView', 'board-view-swimlanes'); //true
      Utils.reload();
@@ -100,7 +114,7 @@ Utils = {
  },

  boardView() {
-    currentUser = Meteor.user();
+    currentUser = ReactiveCache.getCurrentUser();
    if (currentUser) {
      return (currentUser.profile || {}).boardView;
    } else if (
@@ -144,11 +158,8 @@ Utils = {
  },

  archivedBoardIds() {
-    const archivedBoards = [];
-    Boards.find({ archived: false }).forEach(board => {
-      archivedBoards.push(board._id);
-    });
-    return archivedBoards;
+    const ret = ReactiveCache.getBoards({ archived: false }).map(board => board._id);
+    return ret;
  },

  dueCardsView() {
@@ -183,7 +194,7 @@ Utils = {

  // XXX We should remove these two methods
  goBoardId(_id) {
-    const board = Boards.findOne(_id);
+    const board = ReactiveCache.getBoard(_id);
    return (
      board &&
      FlowRouter.go('board', {
@@ -194,8 +205,8 @@ Utils = {
  },

  goCardId(_id) {
-    const card = Cards.findOne(_id);
-    const board = Boards.findOne(card.boardId);
+    const card = ReactiveCache.getCard(_id);
+    const board = ReactiveCache.getBoard(card.boardId);
    return (
      board &&
      FlowRouter.go('card', {
@@ -208,7 +219,7 @@ Utils = {
  getCommonAttachmentMetaFrom(card) {
    const meta = {};
    if (card.isLinkedCard()) {
-      meta.boardId = Cards.findOne(card.linkedId).boardId;
+      meta.boardId = ReactiveCache.getCard(card.linkedId).boardId;
      meta.cardId = card.linkedId;
    } else {
      meta.boardId = card.boardId;
@@ -316,7 +327,7 @@ Utils = {

  // returns if desktop drag handles are enabled
  isShowDesktopDragHandles() {
-    //const currentUser = Meteor.user();
+    //const currentUser = ReactiveCache.getCurrentUser();
    //if (currentUser) {
    //  return (currentUser.profile || {}).showDesktopDragHandles;
    //} else if (window.localStorage.getItem('showDesktopDragHandles')) {
@@ -421,7 +432,7 @@ Utils = {
  },

  setCustomUI(data) {
-    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+    const currentBoard = Utils.getCurrentBoard();
    if (currentBoard) {
      DocHead.setTitle(`${currentBoard.title} - ${data.productName}`);
    } else {
@@ -433,7 +444,7 @@ Utils = {
    window._paq = window._paq || [];
    window._paq.push(['setDoNotTrack', data.doNotTrack]);
    if (data.withUserName) {
-      window._paq.push(['setUserId', Meteor.user().username]);
+      window._paq.push(['setUserId', ReactiveCache.getCurrentUser().username]);
    }
    window._paq.push(['trackPageView']);
    window._paq.push(['enableLinkTracking']);
@@ -421,7 +421,7 @@ _.each(redirections, (newPath, oldPath) => {
 //Meteor.isClient && Meteor.startup(() => {
 //  Tracker.autorun(() => {

-//    const currentBoard = Boards.findOne(Session.get('currentBoard'));
+//    const currentBoard = Utils.getCurrentBoard();
 //    const titleStack = [appTitle];
 //    if (currentBoard) {
 //      titleStack.push(currentBoard.title);
@@ -92,7 +92,7 @@
  "close-add-checklist-item": "Fermer ajouter un élément du formulaire checklist",
  "close-edit-checklist-item": "Fermer éditer un élément du formulaire checklist",
  "convertChecklistItemToCardPopup-title": "Convertir en carte",
-  "add-cover": "Add cover image to minicard",
+  "add-cover": "Ajouter la vignette sur la mini-carte",
  "add-label": "Ajouter une étiquette",
  "add-list": "Ajouter une liste",
  "add-after-list": "Ajouter après la liste",
@@ -140,8 +140,8 @@
  "board-change-color": "Changer la couleur",
  "board-change-background-image": "Changer l'image de fond",
  "board-background-image-url": "URL de l'image de fond",
-  "add-background-image": "Add Background Image",
-  "remove-background-image": "Remove Background Image",
+  "add-background-image": "Ajouter une image de fond",
+  "remove-background-image": "Supprimer l'image de fond",
  "show-at-all-boards-page" : "Afficher sur la page de tous les tableaux",
  "board-info-on-my-boards" : "Paramètres de tous les tableaux",
  "boardInfoOnMyBoardsPopup-title" : "Paramètres de tous les tableaux",
@@ -542,7 +542,7 @@
  "public": "Public",
  "public-desc": "Ce tableau est public. Il est accessible par toutes les personnes disposant du lien et apparaîtra dans les résultats des moteurs de recherche tels que Google. Seuls les membres peuvent le modifier.",
  "quick-access-description": "Ajouter un tableau à vos favoris pour créer un raccourci dans cette barre.",
-  "remove-cover": "Remove cover image from minicard",
+  "remove-cover": "Supprimer la vignette de la mini-carte",
  "remove-from-board": "Retirer du tableau",
  "remove-label": "Retirer l'étiquette",
  "listDeletePopup-title": "Supprimer la liste ?",
@@ -730,7 +730,7 @@
  "deposit-subtasks-list": "Liste de destination pour les sous-tâches déposées ici :",
  "show-parent-in-minicard": "Voir la carte parente dans la mini-carte :",
  "description-on-minicard": "Description sur la mini-carte",
-  "cover-attachment-on-minicard": "Cover image on minicard",
+  "cover-attachment-on-minicard": "Vignette sur la mini-carte",
  "badge-attachment-on-minicard": "Compteur de pièces jointes sur la mini-carte",
  "card-sorting-by-number-on-minicard": "Tri numérique des cartes sur la mini-carte",
  "prefix-with-full-path": "Préfixer avec le chemin complet",
@@ -1089,7 +1089,7 @@
  "label-names": "Noms d'étiquette",
  "archived-at": "archivée le",
  "sort-cards": "Trier les cartes",
-  "sort-is-on": "Sort is on",
+  "sort-is-on": "Le tri est activé",
  "cardsSortPopup-title": "Trier les cartes",
  "due-date": "Date d'échéance",
  "server-error": "Erreur serveur",
@@ -1220,5 +1220,5 @@
  "max-avatar-filesize": "Taille maximum du fichier de l'avatar en octets :",
  "allowed-avatar-filetypes": "Types de fichier autorisés pour l'avatar :",
  "invalid-file": "Si le nom de fichier est invalide, le téléchargement ou le renommage sera annulé.",
-  "preview-pdf-not-supported": "Your device does not support previewing PDF. Try downloading instead."
+  "preview-pdf-not-supported": "Votre périphérique ne supporte pas la prévisualisation de PDF. Essayer plutôt le téléchargement."
 }
@@ -1,7 +1,7 @@
 {
-  "accept": "Accept",
-  "act-activity-notify": "Activity Notification",
-  "act-addAttachment": "added attachment __attachment__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
+  "accept": "受け入れ",
+  "act-activity-notify": "アクティビティ通知",
+  "act-addAttachment": "添付ファイル __attachment__ を ボード __board__, スイムレーン __swimlane__, リスト __list__, カード __card__ に追加しました",
  "act-deleteAttachment": "deleted attachment __attachment__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
  "act-addSubtask": "added subtask __subtask__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
  "act-addLabel": "Added label __label__ to card __card__ at list __list__ at swimlane __swimlane__ at board __board__",
@@ -92,10 +92,10 @@
  "close-add-checklist-item": "Close add an item to checklist form",
  "close-edit-checklist-item": "Close edit an item to checklist form",
  "convertChecklistItemToCardPopup-title": "Convert to Card",
-  "add-cover": "Add cover image to minicard",
+  "add-cover": "ミニカードに表紙画像を追加する",
  "add-label": "Add Label",
  "add-list": "Add List",
-  "add-after-list": "Add After List",
+  "add-after-list": "リストの最後に追加",
  "add-members": "Add Members",
  "added": "Added",
  "addMemberPopup-title": "Members",
@@ -135,13 +135,13 @@
  "attachmentDeletePopup-title": "Delete Attachment?",
  "attachments": "Attachments",
  "auto-watch": "Automatically watch boards when they are created",
-  "avatar-too-big": "The avatar is too large (__size__ max)",
+  "avatar-too-big": "アバターが大きすぎます（最大520KB）",
  "back": "Back",
  "board-change-color": "Change color",
-  "board-change-background-image": "Change Background Image",
-  "board-background-image-url": "Background Image URL",
-  "add-background-image": "Add Background Image",
-  "remove-background-image": "Remove Background Image",
+  "board-change-background-image": "背景画像を変更",
+  "board-background-image-url": "背景画像のURL",
+  "add-background-image": "背景画像を追加",
+  "remove-background-image": "背景画像を削除",
  "show-at-all-boards-page" : "Show at All Boards page",
  "board-info-on-my-boards" : "All Boards Settings",
  "boardInfoOnMyBoardsPopup-title" : "All Boards Settings",
@@ -154,9 +154,9 @@
  "board-public-info": "This board will be <strong>public</strong>.",
  "board-drag-drop-reorder-or-click-open": "Drag and drop to reorder board icons. Click board icon to open board.",
  "boardChangeColorPopup-title": "Change Board Background",
-  "boardChangeBackgroundImagePopup-title": "Change Background Image",
+  "boardChangeBackgroundImagePopup-title": "背景画像を変更",
  "allBoardsChangeColorPopup-title": "Change color",
-  "allBoardsChangeBackgroundImagePopup-title": "Change Background Image",
+  "allBoardsChangeBackgroundImagePopup-title": "背景画像を変更",
  "boardChangeTitlePopup-title": "Rename Board",
  "boardChangeVisibilityPopup-title": "Change Visibility",
  "boardChangeWatchPopup-title": "Change Watch",
@@ -374,7 +374,7 @@
  "error-board-notAMember": "You need to be a member of this board to do that",
  "error-json-malformed": "Your text is not valid JSON",
  "error-json-schema": "Your JSON data does not include the proper information in the correct format",
-  "error-csv-schema": "Your CSV(Comma Separated Values)/TSV (Tab Separated Values) does not include the proper information in the correct format ",
+  "error-csv-schema": "CSV(カンマ区切り)/TSV(タブ区切り)の書式が不正です",
  "error-list-doesNotExist": "This list does not exist",
  "error-user-doesNotExist": "This user does not exist",
  "error-user-notAllowSelf": "You can not invite yourself",
@@ -413,7 +413,7 @@
  "filter-overdue": "Overdue",
  "filter-due-today": "Due today",
  "filter-due-this-week": "Due this week",
-  "filter-due-next-week": "Due next week",
+  "filter-due-next-week": "来週期限",
  "filter-due-tomorrow": "Due tomorrow",
  "list-filter-label": "Filter List by Title",
  "filter-clear": "Clear filter",
@@ -542,7 +542,7 @@
  "public": "Public",
  "public-desc": "This board is public. It's visible to anyone with the link and will show up in search engines like Google. Only people added to the board can edit.",
  "quick-access-description": "Star a board to add a shortcut in this bar.",
-  "remove-cover": "Remove cover image from minicard",
+  "remove-cover": "ミニカードから表紙画像を削除する",
  "remove-from-board": "Remove from Board",
  "remove-label": "Remove Label",
  "listDeletePopup-title": "Delete List ?",
@@ -730,9 +730,9 @@
  "deposit-subtasks-list": "Landing list for subtasks deposited here:",
  "show-parent-in-minicard": "Show parent in minicard:",
  "description-on-minicard": "Description on minicard",
-  "cover-attachment-on-minicard": "Cover image on minicard",
-  "badge-attachment-on-minicard": "Count of attachments on minicard",
-  "card-sorting-by-number-on-minicard": "Card sorting by number on minicard",
+  "cover-attachment-on-minicard": "ミニカードの表紙画像",
+  "badge-attachment-on-minicard": "ミニカードの添付ファイル数",
+  "card-sorting-by-number-on-minicard": "ミニカードの番号順でソートする",
  "prefix-with-full-path": "Prefix with full path",
  "prefix-with-parent": "Prefix with parent",
  "subtext-with-full-path": "Subtext with full path",
@@ -845,7 +845,7 @@
  "r-items-list": "item1,item2,item3",
  "r-add-swimlane": "Add swimlane",
  "r-swimlane-name": "swimlane name",
-  "r-board-note": "Note: leave a field empty to match every possible value. ",
+  "r-board-note": "注意：フィールドを空にするとすべての値に一致します",
  "r-checklist-note": "Note: checklist's items have to be written as comma separated values.",
  "r-when-a-card-is-moved": "When a card is moved to another list",
  "r-set": "Set",
@@ -876,9 +876,9 @@
  "oidc-button-text": "Customize the OIDC button text",
  "default-authentication-method": "Default Authentication Method",
  "duplicate-board": "Duplicate Board",
-  "org-number": "The number of organizations is: ",
-  "team-number": "The number of teams is: ",
-  "people-number": "The number of people is: ",
+  "org-number": "組織数:",
+  "team-number": "チーム数: ",
+  "people-number": "人数:",
  "swimlaneDeletePopup-title": "Delete Swimlane ?",
  "swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
  "restore-all": "Restore all",
@@ -1089,7 +1089,7 @@
  "label-names": "Label Names",
  "archived-at": "archived at",
  "sort-cards": "Sort Cards",
-  "sort-is-on": "Sort is on",
+  "sort-is-on": "ソートが有効",
  "cardsSortPopup-title": "Sort Cards",
  "due-date": "Due Date",
  "server-error": "Server Error",
@@ -1215,10 +1215,10 @@
  "minicardDetailsActionsPopup-title": "Card Details",
  "Mongo_sessions_count": "Mongo sessions count",
  "change-visibility": "Change Visibility",
-  "max-upload-filesize": "Max upload filesize in bytes:",
-  "allowed-upload-filetypes": "Allowed upload filetypes:",
-  "max-avatar-filesize": "Max avatar filesize in bytes:",
-  "allowed-avatar-filetypes": "Allowed avatar filetypes:",
-  "invalid-file": "If filename is invalid, upload or rename is cancelled.",
-  "preview-pdf-not-supported": "Your device does not support previewing PDF. Try downloading instead."
+  "max-upload-filesize": "バイト単位の最大アップロードサイズ: ",
+  "allowed-upload-filetypes": "アップロードできるファイルタイプ",
+  "max-avatar-filesize": "バイト単位の最大アバターファイルサイズ:",
+  "allowed-avatar-filetypes": "アバターに使用できるファイルタイプ",
+  "invalid-file": "無効なファイル名の場合アップロードまたは名前の変更は取り消されます。",
+  "preview-pdf-not-supported": "この端末はPDFのプレビューに対応していません。他の端末でダウンロードしてください。"
 }
@@ -845,7 +845,7 @@
  "r-items-list": "アイテム1、アイテム2、アイテム3",
  "r-add-swimlane": "スイムレーンを追加",
  "r-swimlane-name": "スイムレーン名",
-  "r-board-note": "注意：フィールドを空にすると全ての値に一致します",
+  "r-board-note": "注意：フィールドを空にするとすべての値に一致します",
  "r-checklist-note": "注意：チェックリスト項目はカンマ区切りで記述する必要があります。",
  "r-when-a-card-is-moved": "カードが別のリストに移動したとき",
  "r-set": "設定する",
@@ -1220,5 +1220,5 @@
  "max-avatar-filesize": "Maximal avatar filstorlek i byte:",
  "allowed-avatar-filetypes": "Tillåtna filtyper för avatar:",
  "invalid-file": "Om filnamnet är ogiltigt avbryts uppladdningen eller omdöps filen.",
-  "preview-pdf-not-supported": "Your device does not support previewing PDF. Try downloading instead."
+  "preview-pdf-not-supported": "Din enhet stöder inte förhandsgranskning av PDF. Försök istället att ladda ner."
 }
@@ -732,7 +732,7 @@
  "description-on-minicard": "小卡片描述",
  "cover-attachment-on-minicard": "小卡片封面图片",
  "badge-attachment-on-minicard": "小卡片附件数量",
-  "card-sorting-by-number-on-minicard": "Card sorting by number on minicard",
+  "card-sorting-by-number-on-minicard": "卡片按小卡片编号排序",
  "prefix-with-full-path": "完整路径前缀",
  "prefix-with-parent": "上级前缀",
  "subtext-with-full-path": "子标题显示完整路径",
@@ -1089,7 +1089,7 @@
  "label-names": "标签名",
  "archived-at": "归档于",
  "sort-cards": "排序卡片",
-  "sort-is-on": "Sort is on",
+  "sort-is-on": "已排序",
  "cardsSortPopup-title": "排序卡片",
  "due-date": "截至日期",
  "server-error": "服务错误",
@@ -1220,5 +1220,5 @@
  "max-avatar-filesize": "头像文件最大：",
  "allowed-avatar-filetypes": "头像文件允许类型：",
  "invalid-file": "如果文件名无效，则取消上传或重命名。\n ",
-  "preview-pdf-not-supported": "Your device does not support previewing PDF. Try downloading instead."
+  "preview-pdf-not-supported": "您的设备不支持pdf预览，请尝试下载"
 }
@@ -0,0 +1,30 @@
+Jsons = {
+  stringify(value) {
+    const ret = JSON.stringify(value, this.replacer, 2);
+    return ret;
+  },
+
+  parse(value) {
+    const ret = JSON.parse(value, this.reviver);
+    return ret;
+  },
+
+  // https://stackoverflow.com/questions/12075927/serialization-of-regexp/33416684#33416684
+  replacer(key, value) {
+    if (value instanceof RegExp)
+      return ("___REGEXP___ " + value.toString());
+    else
+      return value;
+  },
+
+  // https://stackoverflow.com/questions/12075927/serialization-of-regexp/33416684#33416684
+  reviver(key, value) {
+    if (value?.toString()?.indexOf("___REGEXP___ ") == 0) {
+      const m = value.split("___REGEXP___ ")[1].match(/\/(.*)\/(.*)?/);
+      return new RegExp(m[1], m[2] || "");
+    } else
+      return value;
+  }
+}
+
+export { Jsons }
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 AccountSettings = new Mongo.Collection('accountSettings');

 AccountSettings.attachSchema(
@@ -44,7 +46,7 @@ AccountSettings.attachSchema(

 AccountSettings.allow({
  update(userId) {
-    const user = Users.findOne(userId);
+    const user = ReactiveCache.getUser(userId);
    return user && user.isAdmin;
  },
 });
@@ -1,16 +1,17 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { Meteor } from 'meteor/meteor';

 Actions = new Mongo.Collection('actions');

 Actions.allow({
  insert(userId, doc) {
-    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardAdmin(userId, ReactiveCache.getBoard(doc.boardId));
  },
  update(userId, doc) {
-    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardAdmin(userId, ReactiveCache.getBoard(doc.boardId));
  },
  remove(userId, doc) {
-    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardAdmin(userId, ReactiveCache.getBoard(doc.boardId));
  },
 });

@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 // Activities don't need a schema because they are always set from the a trusted
 // environment - the server - and there is no risk that a user change the logic
 // we use with this collection. Moreover using a schema for this collection
@@ -12,53 +14,53 @@ Activities = new Mongo.Collection('activities');

 Activities.helpers({
  board() {
-    return Boards.findOne(this.boardId);
+    return ReactiveCache.getBoard(this.boardId);
  },
  oldBoard() {
-    return Boards.findOne(this.oldBoardId);
+    return ReactiveCache.getBoard(this.oldBoardId);
  },
  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },
  member() {
-    return Users.findOne(this.memberId);
+    return ReactiveCache.getUser(this.memberId);
  },
  list() {
-    return Lists.findOne(this.listId);
+    return ReactiveCache.getList(this.listId);
  },
  swimlane() {
-    return Swimlanes.findOne(this.swimlaneId);
+    return ReactiveCache.getSwimlane(this.swimlaneId);
  },
  oldSwimlane() {
-    return Swimlanes.findOne(this.oldSwimlaneId);
+    return ReactiveCache.getSwimlane(this.oldSwimlaneId);
  },
  oldList() {
-    return Lists.findOne(this.oldListId);
+    return ReactiveCache.getList(this.oldListId);
  },
  card() {
-    return Cards.findOne(this.cardId);
+    return ReactiveCache.getCard(this.cardId);
  },
  comment() {
-    return CardComments.findOne(this.commentId);
+    return ReactiveCache.getCardComment(this.commentId);
  },
  attachment() {
-    return Attachments.findOne(this.attachmentId);
+    return ReactiveCache.getAttachment(this.attachmentId);
  },
  checklist() {
-    return Checklists.findOne(this.checklistId);
+    return ReactiveCache.getChecklist(this.checklistId);
  },
  checklistItem() {
-    return ChecklistItems.findOne(this.checklistItemId);
+    return ReactiveCache.getChecklistItem(this.checklistItemId);
  },
  subtasks() {
-    return Cards.findOne(this.subtaskId);
+    return ReactiveCache.getCard(this.subtaskId);
  },
  customField() {
-    return CustomFields.findOne(this.customFieldId);
+    return ReactiveCache.getCustomField(this.customFieldId);
  },
  // Label activity did not work yet, unable to edit labels when tried this.
  //label() {
-  //  return Cards.findOne(this.labelId);
+  //  return ReactiveCache.getCard(this.labelId);
  //},
 });

@@ -108,7 +110,7 @@ if (Meteor.isServer) {
    let participants = [];
    let watchers = [];
    let title = 'act-activity-notify';
-    const board = Boards.findOne(activity.boardId);
+    const board = ReactiveCache.getBoard(activity.boardId);
    const description = `act-${activity.activityType}`;
    const params = {
      activityId: activity._id,
@@ -201,7 +203,7 @@ if (Meteor.isServer) {
      if (board) {
        const comment = params.comment;
        const knownUsers = board.members.map(member => {
-          const u = Users.findOne(member.userId);
+          const u = ReactiveCache.getUser(member.userId);
          if (u) {
            member.username = u.username;
            member.emails = u.emails;
@@ -332,12 +334,12 @@ if (Meteor.isServer) {
      }
    });

-    const integrations = Integrations.find({
+    const integrations = ReactiveCache.getIntegrations({
      boardId: { $in: [board._id, Integrations.Const.GLOBAL_WEBHOOK_ID] },
      // type: 'outgoing-webhooks', // all types
      enabled: true,
      activities: { $in: [description, 'all'] },
-    }).fetch();
+    });
    if (integrations.length > 0) {
      params.watchers = watchers;
      integrations.forEach(integration => {
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 Announcements = new Mongo.Collection('announcements');

 Announcements.attachSchema(
@@ -49,7 +51,7 @@ Announcements.attachSchema(

 Announcements.allow({
  update(userId) {
-    const user = Users.findOne(userId);
+    const user = ReactiveCache.getUser(userId);
    return user && user.isAdmin;
  },
 });
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { Meteor } from 'meteor/meteor';
 import { FilesCollection } from 'meteor/ostrio:files';
 import { isFileValid } from './fileValidation';
@@ -122,7 +123,7 @@ Attachments = new FilesCollection({
      return false;
    }

-    const board = Boards.findOne(fileObj.meta.boardId);
+    const board = ReactiveCache.getBoard(fileObj.meta.boardId);
    if (board.isPublic()) {
      return true;
    }
@@ -134,13 +135,13 @@ Attachments = new FilesCollection({
 if (Meteor.isServer) {
  Attachments.allow({
    insert(userId, fileObj) {
-      return allowIsBoardMember(userId, Boards.findOne(fileObj.boardId));
+      return allowIsBoardMember(userId, ReactiveCache.getBoard(fileObj.boardId));
    },
    update(userId, fileObj) {
-      return allowIsBoardMember(userId, Boards.findOne(fileObj.boardId));
+      return allowIsBoardMember(userId, ReactiveCache.getBoard(fileObj.boardId));
    },
    remove(userId, fileObj) {
-      return allowIsBoardMember(userId, Boards.findOne(fileObj.boardId));
+      return allowIsBoardMember(userId, ReactiveCache.getBoard(fileObj.boardId));
    },
    fetch: ['meta'],
  });
@@ -150,20 +151,20 @@ if (Meteor.isServer) {
      check(fileObjId, String);
      check(storageDestination, String);

-      const fileObj = Attachments.findOne({_id: fileObjId});
+      const fileObj = ReactiveCache.getAttachment(fileObjId);
      moveToStorage(fileObj, storageDestination, fileStoreStrategyFactory);
    },
    renameAttachment(fileObjId, newName) {
      check(fileObjId, String);
      check(newName, String);

-      const fileObj = Attachments.findOne({_id: fileObjId});
+      const fileObj = ReactiveCache.getAttachment(fileObjId);
      rename(fileObj, newName, fileStoreStrategyFactory);
    },
    validateAttachment(fileObjId) {
      check(fileObjId, String);

-      const fileObj = Attachments.findOne({_id: fileObjId});
+      const fileObj = ReactiveCache.getAttachment(fileObjId);
      const isValid = Promise.await(isFileValid(fileObj, attachmentUploadMimeTypes, attachmentUploadSize, attachmentUploadExternalProgram));

      if (!isValid) {
@@ -176,7 +177,7 @@ if (Meteor.isServer) {

      Meteor.call('validateAttachment', fileObjId);

-      const fileObj = Attachments.findOne({_id: fileObjId});
+      const fileObj = ReactiveCache.getAttachment(fileObjId);

      if (fileObj) {
        Meteor.defer(() => Meteor.call('moveAttachmentToStorage', fileObjId, storageDestination));
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 const storeName = 'attachments';
 const defaultStoreOptions = {
  beforeWrite: fileObj => {
@@ -35,19 +37,19 @@ if (Meteor.isServer) {

  AttachmentsOld.allow({
    insert(userId, doc) {
-      return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
+      return allowIsBoardMember(userId, ReactiveCache.getBoard(doc.boardId));
    },
    update(userId, doc) {
-      return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
+      return allowIsBoardMember(userId, ReactiveCache.getBoard(doc.boardId));
    },
    remove(userId, doc) {
-      return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
+      return allowIsBoardMember(userId, ReactiveCache.getBoard(doc.boardId));
    },
    // We authorize the attachment download either:
    // - if the board is public, everyone (even unconnected) can download it
    // - if the board is private, only board members can download it
    download(userId, doc) {
-      const board = Boards.findOne(doc.boardId);
+      const board = ReactiveCache.getBoard(doc.boardId);
      if (board.isPublic()) {
        return true;
      } else {
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { Meteor } from 'meteor/meteor';
 import { FilesCollection } from 'meteor/ostrio:files';
 import { formatFleURL } from 'meteor/ostrio:files/lib';
@@ -100,7 +101,7 @@ Avatars = new FilesCollection({
    const isValid = Promise.await(isFileValid(fileObj, avatarsUploadMimeTypes, avatarsUploadSize, avatarsUploadExternalProgram));

    if (isValid) {
-      Users.findOne(fileObj.userId).setAvatarUrl(`${formatFleURL(fileObj)}?auth=false&brokenIsFine=true`);
+      ReactiveCache.getUser(fileObj.userId).setAvatarUrl(`${formatFleURL(fileObj)}?auth=false&brokenIsFine=true`);
    } else {
      Avatars.remove(fileObj._id);
    }
@@ -112,7 +113,7 @@ Avatars = new FilesCollection({
  onBeforeRemove(files) {
    files.forEach(fileObj => {
      if (fileObj.userId) {
-        Users.findOne(fileObj.userId).setAvatarUrl('');
+        ReactiveCache.getUser(fileObj.userId).setAvatarUrl('');
      }
    });

@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import escapeForRegex from 'escape-string-regexp';
 import { TAPi18n } from '/imports/i18n';
 import {
@@ -637,7 +638,7 @@ Boards.helpers({
    const _id = Boards.insert(this);

    // Copy all swimlanes in board
-    Swimlanes.find({
+    ReactiveCache.getSwimlanes({
      boardId: oldId,
      archived: false,
    }).forEach(swimlane => {
@@ -647,13 +648,13 @@ Boards.helpers({

    // copy custom field definitions
    const cfMap = {};
-    CustomFields.find({ boardIds: oldId }).forEach(cf => {
+    ReactiveCache.getCustomFields({ boardIds: oldId }).forEach(cf => {
      const id = cf._id;
      delete cf._id;
      cf.boardIds = [_id];
      cfMap[id] = CustomFields.insert(cf);
    });
-    Cards.find({ boardId: _id }).forEach(card => {
+    ReactiveCache.getCards({ boardId: _id }).forEach(card => {
      Cards.update(card._id, {
        $set: {
          customFields: card.customFields.map(cf => {
@@ -666,20 +667,20 @@ Boards.helpers({

    // copy rules, actions, and triggers
    const actionsMap = {};
-    Actions.find({ boardId: oldId }).forEach(action => {
+    ReactiveCache.getActions({ boardId: oldId }).forEach(action => {
      const id = action._id;
      delete action._id;
      action.boardId = _id;
      actionsMap[id] = Actions.insert(action);
    });
    const triggersMap = {};
-    Triggers.find({ boardId: oldId }).forEach(trigger => {
+    ReactiveCache.getTriggers({ boardId: oldId }).forEach(trigger => {
      const id = trigger._id;
      delete trigger._id;
      trigger.boardId = _id;
      triggersMap[id] = Triggers.insert(trigger);
    });
-    Rules.find({ boardId: oldId }).forEach(rule => {
+    ReactiveCache.getRules({ boardId: oldId }).forEach(rule => {
      delete rule._id;
      rule.boardId = _id;
      rule.actionId = actionsMap[rule.actionId];
@@ -731,26 +732,22 @@ Boards.helpers({
  },

  cards() {
-    return Cards.find(
+    const ret = ReactiveCache.getCards(
      { boardId: this._id, archived: false },
      { sort: { title: 1 } },
    );
+    return ret;
  },

  lists() {
-    //currentUser = Meteor.user();
-    //if (currentUser) {
-    //  enabled = Meteor.user().hasSortBy();
-    //}
-    //return enabled ? this.newestLists() : this.draggableLists();
    return this.draggableLists();
  },

  newestLists() {
    // sorted lists from newest to the oldest, by its creation date or its cards' last modification date
-    const value = Meteor.user()._getListSortBy();
+    const value = ReactiveCache.getCurrentUser()._getListSortBy();
    const sortKey = { starred: -1, [value[0]]: value[1] }; // [["starred",-1],value];
-    return Lists.find(
+    return ReactiveCache.getLists(
      {
        boardId: this._id,
        archived: false,
@@ -760,19 +757,19 @@ Boards.helpers({
  },

  draggableLists() {
-    return Lists.find({ boardId: this._id }, { sort: { sort: 1 } });
+    return ReactiveCache.getLists({ boardId: this._id }, { sort: { sort: 1 } });
  },

  /** returns the last list
   * @returns Document the last list
   */
  getLastList() {
-    const ret = Lists.findOne({ boardId: this._id }, { sort: { sort: 'desc' } });
+    const ret = ReactiveCache.getList({ boardId: this._id }, { sort: { sort: 'desc' } });
    return ret;
  },

  nullSortLists() {
-    return Lists.find({
+    return ReactiveCache.getLists({
      boardId: this._id,
      archived: false,
      sort: { $eq: null },
@@ -780,14 +777,14 @@ Boards.helpers({
  },

  swimlanes() {
-    return Swimlanes.find(
+    return ReactiveCache.getSwimlanes(
      { boardId: this._id, archived: false },
      { sort: { sort: 1 } },
    );
  },

  nextSwimlane(swimlane) {
-    return Swimlanes.findOne(
+    return ReactiveCache.getSwimlane(
      {
        boardId: this._id,
        archived: false,
@@ -801,7 +798,7 @@ Boards.helpers({
  },

  nullSortSwimlanes() {
-    return Swimlanes.find({
+    return ReactiveCache.getSwimlanes({
      boardId: this._id,
      archived: false,
      sort: { $eq: null },
@@ -809,7 +806,7 @@ Boards.helpers({
  },

  hasOvertimeCards() {
-    const card = Cards.findOne({
+    const card = ReactiveCache.getCard({
      isOvertime: true,
      boardId: this._id,
      archived: false,
@@ -818,7 +815,7 @@ Boards.helpers({
  },

  hasSpentTimeCards() {
-    const card = Cards.findOne({
+    const card = ReactiveCache.getCard({
      spentTime: { $gt: 0 },
      boardId: this._id,
      archived: false,
@@ -828,43 +825,20 @@ Boards.helpers({

  activities() {
    let linkedBoardId = [this._id];
-    Cards.find({
+    ReactiveCache.getCards({
      "type": "cardType-linkedBoard",
      "boardId": this._id}
      ).forEach(card => {
        linkedBoardId.push(card.linkedId);
    });
-    return Activities.find({ boardId: { $in: linkedBoardId } }, { sort: { createdAt: -1 } });
-    //return Activities.find({ boardId: this._id }, { sort: { createdAt: -1 } });
+    const ret = ReactiveCache.getActivities({ boardId: { $in: linkedBoardId } }, { sort: { createdAt: -1 } });
+    return ret;
  },

  activeMembers(){
    return _.where(this.members, { isActive: true });
  },

-  activeMembers2(members, boardTeamUsers) {
-    let allMembers = members;
-    if(this.teams !== undefined && this.teams.length > 0){
-      let index;
-      if(boardTeamUsers && boardTeamUsers.count() > 0){
-        boardTeamUsers.forEach((u) => {
-          index = allMembers.findIndex(function(m){ return m.userId == u._id});
-          if(index == -1){
-            allMembers.push({
-              "isActive": true,
-              "isAdmin": u.isAdmin !== undefined ? u.isAdmin : false,
-              "isCommentOnly" : false,
-              "isNoComments" : false,
-              "userId": u._id,
-            });
-          }
-        });
-      }
-    }
-
-    return allMembers;
-  },
-
  activeOrgs() {
    return _.where(this.orgs, { isActive: true });
  },
@@ -886,7 +860,7 @@ Boards.helpers({
  },

  memberUsers() {
-    return Users.find({ _id: { $in: _.pluck(this.members, 'userId') } });
+    return ReactiveCache.getUsers({ _id: { $in: _.pluck(this.members, 'userId') } });
  },

  getLabel(name, color) {
@@ -969,10 +943,11 @@ Boards.helpers({
  },

  customFields() {
-    return CustomFields.find(
+    const ret = ReactiveCache.getCustomFields(
      { boardIds: { $in: [this._id] } },
      { sort: { name: 1 } },
    );
+    return ret;
  },

  // XXX currently mutations return no value so we have an issue when using addLabel in import
@@ -1012,7 +987,8 @@ Boards.helpers({
      query.$or = [{ title: regex }, { description: regex }];
    }

-    return Cards.find(query, projection);
+    const ret = ReactiveCache.getCards(query, projection);
+    return ret;
  },

  searchSwimlanes(term) {
@@ -1033,7 +1009,7 @@ Boards.helpers({
      query.$or = [{ title: regex }, { description: regex }];
    }

-    return Swimlanes.find(query, projection);
+    return ReactiveCache.getSwimlanes(query, projection);
  },

  searchLists(term) {
@@ -1058,7 +1034,7 @@ Boards.helpers({
        query.$or = [{ title: regex }, { description: regex }];
      }

-      ret = Lists.find(query, projection);
+      ret = ReactiveCache.getLists(query, projection);
    }
    return ret;
  },
@@ -1089,7 +1065,7 @@ Boards.helpers({
        { description: regex },
        { customFields: { $elemMatch: { value: regex } } },
      ];
-      ret = Cards.find(query, projection);
+      ret = ReactiveCache.getCards(query, projection);
    }
    return ret;
  },
@@ -1124,7 +1100,7 @@ Boards.helpers({
  },

  getDefaultSubtasksBoard() {
-    return Boards.findOne(this.getDefaultSubtasksBoardId());
+    return ReactiveCache.getBoard(this.getDefaultSubtasksBoardId());
  },

  //Date Settings option such as received date, start date and so on.
@@ -1157,7 +1133,7 @@ Boards.helpers({
  },

  getDefaultDateSettingsBoard() {
-    return Boards.findOne(this.getDefaultDateSettingsBoardId());
+    return ReactiveCache.getBoard(this.getDefaultDateSettingsBoardId());
  },

  getDefaultSubtasksListId() {
@@ -1175,7 +1151,7 @@ Boards.helpers({
  },

  getDefaultSubtasksList() {
-    return Lists.findOne(this.getDefaultSubtasksListId());
+    return ReactiveCache.getList(this.getDefaultSubtasksListId());
  },

  getDefaultDateSettingsListId() {
@@ -1193,23 +1169,23 @@ Boards.helpers({
  },

  getDefaultDateSettingsList() {
-    return Lists.findOne(this.getDefaultDateSettingsListId());
+    return ReactiveCache.getList(this.getDefaultDateSettingsListId());
  },

  getDefaultSwimline() {
-    let result = Swimlanes.findOne({ boardId: this._id });
+    let result = ReactiveCache.getSwimlane({ boardId: this._id });
    if (result === undefined) {
      Swimlanes.insert({
        title: TAPi18n.__('default'),
        boardId: this._id,
      });
-      result = Swimlanes.findOne({ boardId: this._id });
+      result = ReactiveCache.getSwimlane({ boardId: this._id });
    }
    return result;
  },

  getNextCardNumber() {
-    const boardCards = Cards.find(
+    const boardCards = ReactiveCache.getCard(
      {
        boardId: this._id
      },
@@ -1217,26 +1193,27 @@ Boards.helpers({
        sort: { cardNumber: -1 },
        limit: 1
      }
-    ).fetch();
+    , true);

    // If no card is assigned to the board, return 1
-    if (!boardCards || boardCards.length === 0) {
+    if (!boardCards) {
      return 1;
    }

-    const maxCardNr = !!boardCards[0].cardNumber ? boardCards[0].cardNumber : 0;
+    const maxCardNr = !!boardCards.cardNumber ? boardCards.cardNumber : 0;
    return maxCardNr + 1;
  },

  cardsDueInBetween(start, end) {
-    return Cards.find({
+    const ret = ReactiveCache.getCards({
      boardId: this._id,
      dueAt: { $gte: start, $lte: end },
    });
+    return ret;
  },

  cardsInInterval(start, end) {
-    return Cards.find({
+    const ret = ReactiveCache.getCards({
      boardId: this._id,
      $or: [
        {
@@ -1265,6 +1242,7 @@ Boards.helpers({
        },
      ],
    });
+    return ret;
  },

  isTemplateBoard() {
@@ -1298,9 +1276,10 @@ Boards.mutations({
  },

  setBackgroundImageURL(backgroundImageURL) {
-    if(Meteor.user().isBoardAdmin()) {
+    const currentUser = ReactiveCache.getCurrentUser();
+    if(currentUser.isBoardAdmin()) {
      return { $set: { backgroundImageURL } };
-    } else if (Meteor.user().isAdmin()) {
+    } else if (currentUser.isAdmin()) {
      return { $set: { backgroundImageURL } };
    } else {
      return false;
@@ -1554,10 +1533,10 @@ Boards.uniqueTitle = title => {
  );
  const base = escapeForRegex(m.groups.title);
  const baseTitle = m.groups.title;
-  boards = Boards.find({ title: new RegExp(`^${base}\\s*(\\[(?<num>\\d+)]\\s*$|\\s*$)`) });
-  if (boards.count() > 0) {
+  boards = ReactiveCache.getBoards({ title: new RegExp(`^${base}\\s*(\\[(?<num>\\d+)]\\s*$|\\s*$)`) });
+  if (boards.length > 0) {
    let num = 0;
-    Boards.find({ title: new RegExp(`^${base}\\s*\\[\\d+]\\s*$`) }).forEach(
+    ReactiveCache.getBoards({ title: new RegExp(`^${base}\\s*\\[\\d+]\\s*$`) }).forEach(
      board => {
        const m = board.title.match(
          new RegExp('^(?<title>.*?)\\s*\\[(?<num>\\d+)]\\s*$'),
@@ -1587,7 +1566,8 @@ Boards.userSearch = (
  if (userId) {
    selector.$or.push({ members: { $elemMatch: { userId, isActive: true } } });
  }
-  return Boards.find(selector, projection);
+  const ret = ReactiveCache.getBoards(selector, projection);
+  return ret;
 };

 Boards.userBoards = (
@@ -1596,7 +1576,7 @@ Boards.userBoards = (
  selector = {},
  projection = {},
 ) => {
-  const user = Users.findOne(userId);
+  const user = ReactiveCache.getUser(userId);
  if (!user) {
    return [];
  }
@@ -1615,7 +1595,7 @@ Boards.userBoards = (
    { teams: { $elemMatch: { teamId: { $in: user.teamIds() }, isActive: true } } },
  ];

-  return Boards.find(selector, projection);
+  return ReactiveCache.getBoards(selector, projection);
 };

 Boards.userBoardIds = (userId, archived = false, selector = {}) => {
@@ -1692,11 +1672,11 @@ if (Meteor.isServer) {
  Meteor.methods({
    getBackgroundImageURL(boardId) {
      check(boardId, String);
-      return Boards.findOne({ boardId: boardId }, {}, { backgroundImageUrl: 1 });
+      return ReactiveCache.getBoard(boardId, {}, { backgroundImageUrl: 1 });
    },
    quitBoard(boardId) {
      check(boardId, String);
-      const board = Boards.findOne(boardId);
+      const board = ReactiveCache.getBoard(boardId);
      if (board) {
        const userId = Meteor.userId();
        const index = board.memberIndex(userId);
@@ -1708,7 +1688,7 @@ if (Meteor.isServer) {
    },
    acceptInvite(boardId) {
      check(boardId, String);
-      const board = Boards.findOne(boardId);
+      const board = ReactiveCache.getBoard(boardId);
      if (!board) {
        throw new Meteor.Error('error-board-doesNotExist');
      }
@@ -1749,7 +1729,7 @@ if (Meteor.isServer) {
  Meteor.methods({
    archiveBoard(boardId) {
      check(boardId, String);
-      const board = Boards.findOne(boardId);
+      const board = ReactiveCache.getBoard(boardId);
      if (board) {
        const userId = Meteor.userId();
        const index = board.memberIndex(userId);
@@ -1784,7 +1764,7 @@ if (Meteor.isServer) {

 // Insert new board at last position in sort order.
 Boards.before.insert((userId, doc) => {
-  const lastBoard = Boards.findOne(
+  const lastBoard = ReactiveCache.getBoard(
    { sort: { $exists: true } },
    { sort: { sort: -1 } },
  );
@@ -1970,7 +1950,7 @@ if (Meteor.isServer) {
        req.userId === paramUserId,
      );

-      const data = Boards.find(
+      const data = ReactiveCache.getBoards(
        {
          archived: false,
          'members.userId': paramUserId,
@@ -2006,7 +1986,7 @@ if (Meteor.isServer) {
      Authentication.checkUserId(req.userId);
      JsonRoutes.sendResult(res, {
        code: 200,
-        data: Boards.find(
+        data: ReactiveCache.getBoards(
          { permission: 'public' },
          {
            sort: { sort: 1 /* boards default sorting */ },
@@ -2038,8 +2018,8 @@ if (Meteor.isServer) {
      JsonRoutes.sendResult(res, {
        code: 200,
        data: {
-          private: Boards.find({ permission: 'private' }).count(),
-          public: Boards.find({ permission: 'public' }).count(),
+          private: ReactiveCache.getBoards({ permission: 'private' }).length,
+          public: ReactiveCache.getBoards({ permission: 'public' }).length,
        },
      });
    } catch (error) {
@@ -2064,7 +2044,7 @@ if (Meteor.isServer) {

      JsonRoutes.sendResult(res, {
        code: 200,
-        data: Boards.findOne({ _id: paramBoardId }),
+        data: ReactiveCache.getBoard(paramBoardId),
      });
    } catch (error) {
      JsonRoutes.sendResult(res, {
@@ -2181,7 +2161,7 @@ if (Meteor.isServer) {
    Authentication.checkBoardAccess(req.userId, id);
    try {
      if (req.body.hasOwnProperty('label')) {
-        const board = Boards.findOne({ _id: id });
+        const board = ReactiveCache.getBoard(id);
        const color = req.body.label.color;
        const name = req.body.label.name;
        const labelId = Random.id(6);
@@ -2228,7 +2208,7 @@ if (Meteor.isServer) {
      const boardId = req.params.boardId;
      const memberId = req.params.memberId;
      const { isAdmin, isNoComments, isCommentOnly, isWorker } = req.body;
-      const board = Boards.findOne({ _id: boardId });
+      const board = ReactiveCache.getBoard(boardId);
      function isTrue(data) {
        try {
          return data.toLowerCase() === 'true';
@@ -2279,8 +2259,8 @@ if (Meteor.isServer) {
    Authentication.checkBoardAccess(req.userId, paramBoardId);
    JsonRoutes.sendResult(res, {
      code: 200,
-      data: Attachments
-        .find({'meta.boardId': paramBoardId })
+      data: ReactiveCache
+        .getAttachments({'meta.boardId': paramBoardId }, {}, true)
        .each()
        .map(function(attachment) {
          return {
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 const commentReactionSchema = new SimpleSchema({
  reactionCodepoint: {
    type: String,
@@ -49,13 +51,13 @@ CardCommentReactions.attachSchema(

 CardCommentReactions.allow({
  insert(userId, doc) {
-    return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardMember(userId, ReactiveCache.getBoard(doc.boardId));
  },
  update(userId, doc) {
-    return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardMember(userId, ReactiveCache.getBoard(doc.boardId));
  },
  remove(userId, doc) {
-    return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardMember(userId, ReactiveCache.getBoard(doc.boardId));
  },
  fetch: ['boardId'],
 });
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import escapeForRegex from 'escape-string-regexp';
 import DOMPurify from 'dompurify';

@@ -74,13 +75,13 @@ CardComments.attachSchema(

 CardComments.allow({
  insert(userId, doc) {
-    return allowIsBoardMember(userId, Boards.findOne(doc.boardId));
+    return allowIsBoardMember(userId, ReactiveCache.getBoard(doc.boardId));
  },
  update(userId, doc) {
-    return userId === doc.userId || allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+    return userId === doc.userId || allowIsBoardAdmin(userId, ReactiveCache.getBoard(doc.boardId));
  },
  remove(userId, doc) {
-    return userId === doc.userId || allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+    return userId === doc.userId || allowIsBoardAdmin(userId, ReactiveCache.getBoard(doc.boardId));
  },
  fetch: ['userId', 'boardId'],
 });
@@ -93,11 +94,11 @@ CardComments.helpers({
  },

  user() {
-    return Users.findOne(this.userId);
+    return ReactiveCache.getUser(this.userId);
  },

  reactions() {
-    const cardCommentReactions = CardCommentReactions.findOne({cardCommentId: this._id});
+    const cardCommentReactions = ReactiveCache.getCardCommentReaction({cardCommentId: this._id});
    return !!cardCommentReactions ? cardCommentReactions.reactions : [];
  },

@@ -106,7 +107,7 @@ CardComments.helpers({
      return false;
    } else {

-      const cardCommentReactions = CardCommentReactions.findOne({cardCommentId: this._id});
+      const cardCommentReactions = ReactiveCache.getCardCommentReaction({cardCommentId: this._id});
      const reactions = !!cardCommentReactions ? cardCommentReactions.reactions : [];
      const userId = Meteor.userId();
      const reaction = reactions.find(r => r.reactionCodepoint === reactionCodepoint);
@@ -146,7 +147,7 @@ CardComments.helpers({
 CardComments.hookOptions.after.update = { fetchPrevious: false };

 function commentCreation(userId, doc) {
-  const card = Cards.findOne(doc.cardId);
+  const card = ReactiveCache.getCard(doc.cardId);
  Activities.insert({
    userId,
    activityType: 'addComment',
@@ -171,7 +172,7 @@ CardComments.textSearch = (userId, textArray) => {
  // eslint-disable-next-line no-console
  // console.log('cardComments selector:', selector);

-  const comments = CardComments.find(selector);
+  const comments = ReactiveCache.getCardComments(selector);
  // eslint-disable-next-line no-console
  // console.log('count:', comments.count());
  // eslint-disable-next-line no-console
@@ -193,7 +194,7 @@ if (Meteor.isServer) {
  });

  CardComments.after.update((userId, doc) => {
-    const card = Cards.findOne(doc.cardId);
+    const card = ReactiveCache.getCard(doc.cardId);
    Activities.insert({
      userId,
      activityType: 'editComment',
@@ -206,7 +207,7 @@ if (Meteor.isServer) {
  });

  CardComments.before.remove((userId, doc) => {
-    const card = Cards.findOne(doc.cardId);
+    const card = ReactiveCache.getCard(doc.cardId);
    Activities.insert({
      userId,
      activityType: 'deleteComment',
@@ -216,7 +217,7 @@ if (Meteor.isServer) {
      listId: card.listId,
      swimlaneId: card.swimlaneId,
    });
-    const activity = Activities.findOne({ commentId: doc._id });
+    const activity = ReactiveCache.getActivity({ commentId: doc._id });
    if (activity) {
      Activities.remove(activity._id);
    }
@@ -245,7 +246,7 @@ if (Meteor.isServer) {
      Authentication.checkBoardAccess(req.userId, paramBoardId);
      JsonRoutes.sendResult(res, {
        code: 200,
-        data: CardComments.find({
+        data: ReactiveCache.getCardComments({
          boardId: paramBoardId,
          cardId: paramCardId,
        }).map(function (doc) {
@@ -284,7 +285,7 @@ if (Meteor.isServer) {
        Authentication.checkBoardAccess(req.userId, paramBoardId);
        JsonRoutes.sendResult(res, {
          code: 200,
-          data: CardComments.findOne({
+          data: ReactiveCache.getCardComment({
            _id: paramCommentId,
            cardId: paramCardId,
            boardId: paramBoardId,
@@ -331,7 +332,7 @@ if (Meteor.isServer) {
          },
        });

-        const cardComment = CardComments.findOne({
+        const cardComment = ReactiveCache.getCardComment({
          _id: id,
          cardId: paramCardId,
          boardId: paramBoardId,
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 ChecklistItems = new Mongo.Collection('checklistItems');

 /**
@@ -68,13 +70,13 @@ ChecklistItems.attachSchema(

 ChecklistItems.allow({
  insert(userId, doc) {
-    return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId));
+    return allowIsBoardMemberByCard(userId, ReactiveCache.getCard(doc.cardId));
  },
  update(userId, doc) {
-    return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId));
+    return allowIsBoardMemberByCard(userId, ReactiveCache.getCard(doc.cardId));
  },
  remove(userId, doc) {
-    return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId));
+    return allowIsBoardMemberByCard(userId, ReactiveCache.getCard(doc.cardId));
  },
  fetch: ['userId', 'cardId'],
 });
@@ -100,7 +102,7 @@ ChecklistItems.mutations({
    return { $set: { isFinished: !this.isFinished } };
  },
  move(checklistId, sortIndex) {
-    const cardId = Checklists.findOne(checklistId).cardId;
+    const cardId = ReactiveCache.getChecklist(checklistId).cardId;
    const mutatedFields = {
      cardId,
      checklistId,
@@ -113,7 +115,7 @@ ChecklistItems.mutations({

 // Activities helper
 function itemCreation(userId, doc) {
-  const card = Cards.findOne(doc.cardId);
+  const card = ReactiveCache.getCard(doc.cardId);
  const boardId = card.boardId;
  Activities.insert({
    userId,
@@ -135,7 +137,7 @@ function itemRemover(userId, doc) {
 }

 function publishCheckActivity(userId, doc) {
-  const card = Cards.findOne(doc.cardId);
+  const card = ReactiveCache.getCard(doc.cardId);
  const boardId = card.boardId;
  let activityType;
  if (doc.isFinished) {
@@ -158,10 +160,10 @@ function publishCheckActivity(userId, doc) {
 }

 function publishChekListCompleted(userId, doc) {
-  const card = Cards.findOne(doc.cardId);
+  const card = ReactiveCache.getCard(doc.cardId);
  const boardId = card.boardId;
  const checklistId = doc.checklistId;
-  const checkList = Checklists.findOne({ _id: checklistId });
+  const checkList = ReactiveCache.getChecklist(checklistId);
  if (checkList.isFinished()) {
    const act = {
      userId,
@@ -178,10 +180,10 @@ function publishChekListCompleted(userId, doc) {
 }

 function publishChekListUncompleted(userId, doc) {
-  const card = Cards.findOne(doc.cardId);
+  const card = ReactiveCache.getCard(doc.cardId);
  const boardId = card.boardId;
  const checklistId = doc.checklistId;
-  const checkList = Checklists.findOne({ _id: checklistId });
+  const checkList = ReactiveCache.getChecklist(checklistId);
  // BUGS in IFTTT Rules: https://github.com/wekan/wekan/issues/1972
  //       Currently in checklist all are set as uncompleted/not checked,
  //       IFTTT Rule does not move card to other list.
@@ -233,7 +235,7 @@ if (Meteor.isServer) {

  ChecklistItems.before.remove((userId, doc) => {
    itemRemover(userId, doc);
-    const card = Cards.findOne(doc.cardId);
+    const card = ReactiveCache.getCard(doc.cardId);
    const boardId = card.boardId;
    Activities.insert({
      userId,
@@ -268,7 +270,7 @@ if (Meteor.isServer) {
      const paramBoardId = req.params.boardId;
      const paramItemId = req.params.itemId;
      Authentication.checkBoardAccess(req.userId, paramBoardId);
-      const checklistItem = ChecklistItems.findOne({ _id: paramItemId });
+      const checklistItem = ReactiveCache.getChecklistItem(paramItemId);
      if (checklistItem) {
        JsonRoutes.sendResult(res, {
          code: 200,
@@ -301,7 +303,7 @@ if (Meteor.isServer) {
      const paramChecklistId = req.params.checklistId;
      const paramCardId = req.params.cardId;
      Authentication.checkBoardAccess(req.userId, paramBoardId);
-      const checklist = Checklists.findOne({
+      const checklist = ReactiveCache.getChecklist({
        _id: paramChecklistId,
        cardId: paramCardId,
      });
@@ -1,3 +1,5 @@
+import { ReactiveCache, ReactiveMiniMongoIndex } from '/imports/reactiveCache';
+
 Checklists = new Mongo.Collection('checklists');

 /**
@@ -70,7 +72,7 @@ Checklists.helpers({
    delete copyObj._id;
    copyObj.cardId = newCardId;
    const newChecklistId = Checklists.insert(copyObj);
-    ChecklistItems.find({ checklistId: this._id }).forEach(function(
+    ReactiveCache.getChecklistItems({ checklistId: this._id }).forEach(function(
      item,
    ) {
      item._id = null;
@@ -81,42 +83,35 @@ Checklists.helpers({
  },

  itemCount() {
-    return ChecklistItems.find({ checklistId: this._id }).count();
+    const ret = this.items().length;
+    return ret;
  },
  items() {
-    return ChecklistItems.find(
-      {
-        checklistId: this._id,
-      },
-      { sort: ['sort'] },
-    );
+    const ret = ReactiveMiniMongoIndex.getChecklistItemsWithChecklistId(this._id, {}, { sort: ['sort'] });
+    return ret;
+
  },
  firstItem() {
-    const allItems = this.items().fetch();
-    const ret = _.first(allItems);
+    const ret = _.first(this.items());
    return ret;
  },
  lastItem() {
-    const allItems = this.items().fetch();
-    const ret = allItems[allItems.length - 1];
+    const ret = _.last(this.items());
    return ret;
  },
  finishedCount() {
-    return ChecklistItems.find({
-      checklistId: this._id,
-      isFinished: true,
-    }).count();
+    const ret = this.items().filter(_item => _item.isFinished).length;
+    return ret;
  },
  /** returns the finished percent of the checklist */
  finishedPercent() {
-    const checklistItems = ChecklistItems.find({ checklistId: this._id });
-    const count = checklistItems.count();
-    const checklistItemsFinished = checklistItems.fetch().filter(checklistItem => checklistItem.isFinished);
+    const count = this.itemCount();
+    const checklistItemsFinished = this.finishedCount();

    let ret = 0;

    if (count > 0) {
-      ret = Math.round(checklistItemsFinished.length / count * 100);
+      ret = Math.round(checklistItemsFinished / count * 100);
    }
    return ret;
  },
@@ -124,32 +119,32 @@ Checklists.helpers({
    return 0 !== this.itemCount() && this.itemCount() === this.finishedCount();
  },
  checkAllItems() {
-    const checkItems = ChecklistItems.find({ checklistId: this._id });
+    const checkItems = ReactiveCache.getChecklistItems({ checklistId: this._id });
    checkItems.forEach(function(item) {
      item.check();
    });
  },
  uncheckAllItems() {
-    const checkItems = ChecklistItems.find({ checklistId: this._id });
+    const checkItems = ReactiveCache.getChecklistItems({ checklistId: this._id });
    checkItems.forEach(function(item) {
      item.uncheck();
    });
  },
  itemIndex(itemId) {
-    const items = self.findOne({ _id: this._id }).items;
+    const items = ReactiveCache.getChecklist({ _id: this._id }).items;
    return _.pluck(items, '_id').indexOf(itemId);
  },
 });

 Checklists.allow({
  insert(userId, doc) {
-    return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId));
+    return allowIsBoardMemberByCard(userId, ReactiveCache.getCard(doc.cardId));
  },
  update(userId, doc) {
-    return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId));
+    return allowIsBoardMemberByCard(userId, ReactiveCache.getCard(doc.cardId));
  },
  remove(userId, doc) {
-    return allowIsBoardMemberByCard(userId, Cards.findOne(doc.cardId));
+    return allowIsBoardMemberByCard(userId, ReactiveCache.getCard(doc.cardId));
  },
  fetch: ['userId', 'cardId'],
 });
@@ -170,7 +165,7 @@ Checklists.mutations({
   */
  move(newCardId) {
    // update every activity
-    Activities.find(
+    ReactiveCache.getActivities(
      {checklistId: this._id}
    ).forEach(activity => {
      Activities.update(activity._id, {
@@ -180,7 +175,7 @@ Checklists.mutations({
      });
    });
    // update every checklist-item
-    ChecklistItems.find(
+    ReactiveCache.getChecklistItems(
      {checklistId: this._id}
    ).forEach(checklistItem => {
      ChecklistItems.update(checklistItem._id, {
@@ -205,7 +200,7 @@ if (Meteor.isServer) {
  });

  Checklists.after.insert((userId, doc) => {
-    const card = Cards.findOne(doc.cardId);
+    const card = ReactiveCache.getCard(doc.cardId);
    Activities.insert({
      userId,
      activityType: 'addChecklist',
@@ -219,8 +214,8 @@ if (Meteor.isServer) {
  });

  Checklists.before.remove((userId, doc) => {
-    const activities = Activities.find({ checklistId: doc._id });
-    const card = Cards.findOne(doc.cardId);
+    const activities = ReactiveCache.getActivities({ checklistId: doc._id });
+    const card = ReactiveCache.getCard(doc.cardId);
    if (activities) {
      activities.forEach(activity => {
        Activities.remove(activity._id);
@@ -230,7 +225,7 @@ if (Meteor.isServer) {
      userId,
      activityType: 'removeChecklist',
      cardId: doc.cardId,
-      boardId: Cards.findOne(doc.cardId).boardId,
+      boardId: ReactiveCache.getCard(doc.cardId).boardId,
      checklistId: doc._id,
      checklistName: doc.title,
      listId: card.listId,
@@ -256,7 +251,7 @@ if (Meteor.isServer) {
      const paramBoardId = req.params.boardId;
      const paramCardId = req.params.cardId;
      Authentication.checkBoardAccess(req.userId, paramBoardId);
-      const checklists = Checklists.find({ cardId: paramCardId }).map(function(
+      const checklists = ReactiveCache.getChecklists({ cardId: paramCardId }).map(function(
        doc,
      ) {
        return {
@@ -301,12 +296,12 @@ if (Meteor.isServer) {
      const paramChecklistId = req.params.checklistId;
      const paramCardId = req.params.cardId;
      Authentication.checkBoardAccess(req.userId, paramBoardId);
-      const checklist = Checklists.findOne({
+      const checklist = ReactiveCache.getChecklist({
        _id: paramChecklistId,
        cardId: paramCardId,
      });
      if (checklist) {
-        checklist.items = ChecklistItems.find({
+        checklist.items = ReactiveCache.getChecklistItems({
          checklistId: checklist._id,
        }).map(function(doc) {
          return {
@@ -346,9 +341,7 @@ if (Meteor.isServer) {
      const paramBoardId = req.params.boardId;
      Authentication.checkBoardAccess(req.userId, paramBoardId);
      // Check user has permission to add checklist to the card
-      const board = Boards.findOne({
-        _id: paramBoardId,
-      });
+      const board = ReactiveCache.getBoard(paramBoardId);
      const addPermission = allowIsBoardMemberCommentOnly(req.userId, board);
      Authentication.checkAdminOrCondition(req.userId, addPermission);
      const paramCardId = req.params.cardId;
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+import { isEmptyObject } from 'jquery';
 import Boards from './boards';

 export class CsvCreator {
@@ -254,10 +256,10 @@ export class CsvCreator {
        createdAt: this._now(),
      };
      if (csvData[i][this.fieldIndex.stage]) {
-        const existingList = Lists.find({
+        const existingList = ReactiveCache.getLists({
          title: csvData[i][this.fieldIndex.stage],
          boardId,
-        }).fetch();
+        });
        if (existingList.length > 0) {
          continue;
        } else {
@@ -282,10 +284,6 @@ export class CsvCreator {
      const cardToCreate = {
        archived: false,
        boardId,
-        createdAt:
-          csvData[i][this.fieldIndex.createdAt] !== ' ' || ''
-            ? this._now(new Date(csvData[i][this.fieldIndex.createdAt]))
-            : null,
        dateLastActivity: this._now(),
        description: csvData[i][this.fieldIndex.description],
        listId: this.lists[csvData[i][this.fieldIndex.stage]],
@@ -293,28 +291,37 @@ export class CsvCreator {
        sort: -1,
        title: csvData[i][this.fieldIndex.title],
        userId: this._user(),
-        startAt:
-          csvData[i][this.fieldIndex.startAt] !== ' ' || ''
-            ? this._now(new Date(csvData[i][this.fieldIndex.startAt]))
-            : null,
-        dueAt:
-          csvData[i][this.fieldIndex.dueAt] !== ' ' || ''
-            ? this._now(new Date(csvData[i][this.fieldIndex.dueAt]))
-            : null,
-        endAt:
-          csvData[i][this.fieldIndex.endAt] !== ' ' || ''
-            ? this._now(new Date(csvData[i][this.fieldIndex.endAt]))
-            : null,
        spentTime: null,
        labelIds: [],
-        modifiedAt:
-          csvData[i][this.fieldIndex.modifiedAt] !== ' ' || ''
-            ? this._now(new Date(csvData[i][this.fieldIndex.modifiedAt]))
-            : null,
      };
+      if (csvData[i][this.fieldIndex.createdAt] !== ' ' || '') {
+        if (csvData[i][this.fieldIndex.createdAt].length !== 0) {
+        cardToCreate.createdAt = this._now(new Date(csvData[i][this.fieldIndex.createdAt]))
+        }
+      }
+      if (csvData[i][this.fieldIndex.startAt] !== ' ' || '') {
+        if (csvData[i][this.fieldIndex.startAt].length !== 0) {
+        cardToCreate.startAt = this._now(new Date(csvData[i][this.fieldIndex.startAt]))
+        }
+      }
+      if (csvData[i][this.fieldIndex.dueAt] !== ' ' || '') {
+        if (csvData[i][this.fieldIndex.dueAt].length !== 0) {
+        cardToCreate.dueAt = this._now(new Date(csvData[i][this.fieldIndex.dueAt]))
+        }
+      }
+      if (csvData[i][this.fieldIndex.endAt] !== ' ' || '') {
+        if (csvData[i][this.fieldIndex.endAt].length !== 0) {
+        cardToCreate.endAt = this._now(new Date(csvData[i][this.fieldIndex.endAt]))
+        }
+      }
+      if (csvData[i][this.fieldIndex.modifiedAt] !== ' ' || '') {
+        if (csvData[i][this.fieldIndex.modifiedAt].length !== 0) {
+        cardToCreate.modifiedAt = this._now(new Date(csvData[i][this.fieldIndex.modifiedAt]))
+        }
+      }
      // add the labels
      if (csvData[i][this.fieldIndex.labels]) {
-        const board = Boards.findOne(boardId);
+        const board = ReactiveCache.getBoard(boardId);
        for (const importedLabel of csvData[i][this.fieldIndex.labels].split(
          ' ',
        )) {
@@ -370,8 +377,8 @@ export class CsvCreator {
          }
          cardToCreate.customFields = customFields;
        });
-        Cards.direct.insert(cardToCreate);
      }
+      Cards.direct.insert(cardToCreate);
    }
  }

@@ -381,7 +388,7 @@ export class CsvCreator {
      Meteor.settings.public &&
      Meteor.settings.public.sandstorm;
    if (isSandstorm && currentBoardId) {
-      const currentBoard = Boards.findOne(currentBoardId);
+      const currentBoard = ReactiveCache.getBoard(currentBoardId);
      currentBoard.archive();
    }
    this.mapHeadertoCardFieldIndex(board[0]);
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 CustomFields = new Mongo.Collection('customFields');

 /**
@@ -168,25 +170,25 @@ CustomFields.allow({
  insert(userId, doc) {
    return allowIsAnyBoardMember(
      userId,
-      Boards.find({
+      ReactiveCache.getBoards({
        _id: { $in: doc.boardIds },
-      }).fetch(),
+      }),
    );
  },
  update(userId, doc) {
    return allowIsAnyBoardMember(
      userId,
-      Boards.find({
+      ReactiveCache.getBoards({
        _id: { $in: doc.boardIds },
-      }).fetch(),
+      }),
    );
  },
  remove(userId, doc) {
    return allowIsAnyBoardMember(
      userId,
-      Boards.find({
+      ReactiveCache.getBoards({
        _id: { $in: doc.boardIds },
-      }).fetch(),
+      }),
    );
  },
  fetch: ['userId', 'boardIds'],
@@ -216,8 +218,8 @@ function customFieldDeletion(userId, doc) {
 // This has some bug, it does not show edited customField value at Outgoing Webhook,
 // instead it shows undefined, and no listId and swimlaneId.
 function customFieldEdit(userId, doc) {
-  const card = Cards.findOne(doc.cardId);
-  const customFieldValue = Activities.findOne({ customFieldId: doc._id }).value;
+  const card = ReactiveCache.getCard(doc.cardId);
+  const customFieldValue = ReactiveCache.getActivity({ customFieldId: doc._id }).value;
  Activities.insert({
    userId,
    activityType: 'setCustomField',
@@ -305,7 +307,7 @@ if (Meteor.isServer) {
    Authentication.checkBoardAccess(req.userId, paramBoardId);
    JsonRoutes.sendResult(res, {
      code: 200,
-      data: CustomFields.find({ boardIds: { $in: [paramBoardId] } }).map(
+      data: ReactiveCache.getCustomFields({ boardIds: { $in: [paramBoardId] } }).map(
        function(cf) {
          return {
            _id: cf._id,
@@ -335,7 +337,7 @@ if (Meteor.isServer) {
      Authentication.checkBoardAccess(req.userId, paramBoardId);
      JsonRoutes.sendResult(res, {
        code: 200,
-        data: CustomFields.findOne({
+        data: ReactiveCache.getCustomField({
          _id: paramCustomFieldId,
          boardIds: { $in: [paramBoardId] },
        }),
@@ -363,7 +365,7 @@ if (Meteor.isServer) {
  ) {
    const paramBoardId = req.params.boardId;
    Authentication.checkBoardAccess(req.userId, paramBoardId);
-    const board = Boards.findOne({ _id: paramBoardId });
+    const board = ReactiveCache.getBoard(paramBoardId);
    const id = CustomFields.direct.insert({
      name: req.body.name,
      type: req.body.type,
@@ -375,7 +377,7 @@ if (Meteor.isServer) {
      boardIds: [board._id],
    });

-    const customField = CustomFields.findOne({
+    const customField = ReactiveCache.getCustomField({
      _id: id,
      boardIds: { $in: [paramBoardId] },
    });
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { Exporter } from './exporter';
 import { Meteor } from 'meteor/meteor';

@@ -34,16 +35,14 @@ if (Meteor.isServer) {
    const loginToken = req.query.authToken;
    if (loginToken) {
      const hashToken = Accounts._hashLoginToken(loginToken);
-      user = Meteor.users.findOne({
+      user = ReactiveCache.getUser({
        'services.resume.loginTokens.hashedToken': hashToken,
      });
      adminId = user._id.toString();
-      impersonateDone = ImpersonatedUsers.findOne({
-        adminId: adminId,
-      });
+      impersonateDone = ReactiveCache.getImpersonatedUser({ adminId: adminId });
    } else if (!Meteor.settings.public.sandstorm) {
      Authentication.checkUserId(req.userId);
-      user = Users.findOne({ _id: req.userId, isAdmin: true });
+      user = ReactiveCache.getUser({ _id: req.userId, isAdmin: true });
    }
    const exporter = new Exporter(boardId);
    if (exporter.canExport(user) || impersonateDone) {
@@ -98,16 +97,14 @@ if (Meteor.isServer) {
      const loginToken = req.query.authToken;
      if (loginToken) {
        const hashToken = Accounts._hashLoginToken(loginToken);
-        user = Meteor.users.findOne({
+        user = ReactiveCache.getUser({
          'services.resume.loginTokens.hashedToken': hashToken,
        });
        adminId = user._id.toString();
-        impersonateDone = ImpersonatedUsers.findOne({
-          adminId: adminId,
-        });
+        impersonateDone = ReactiveCache.getImpersonatedUser({ adminId: adminId });
      } else if (!Meteor.settings.public.sandstorm) {
        Authentication.checkUserId(req.userId);
-        user = Users.findOne({ _id: req.userId, isAdmin: true });
+        user = ReactiveCache.getUser({ _id: req.userId, isAdmin: true });
      }
      const exporter = new Exporter(boardId, attachmentId);
      if (exporter.canExport(user) || impersonateDone) {
@@ -154,16 +151,14 @@ if (Meteor.isServer) {
    const loginToken = params.query.authToken;
    if (loginToken) {
      const hashToken = Accounts._hashLoginToken(loginToken);
-      user = Meteor.users.findOne({
+      user = ReactiveCache.getUser({
        'services.resume.loginTokens.hashedToken': hashToken,
      });
      adminId = user._id.toString();
-      impersonateDone = ImpersonatedUsers.findOne({
-        adminId: adminId,
-      });
+      impersonateDone = ReactiveCache.getImpersonatedUser({ adminId: adminId });
    } else if (!Meteor.settings.public.sandstorm) {
      Authentication.checkUserId(req.userId);
-      user = Users.findOne({
+      user = ReactiveCache.getUser({
        _id: req.userId,
        isAdmin: true,
      });
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import { runOnServer } from './runOnServer';

@@ -37,16 +38,14 @@ runOnServer(function() {
    const loginToken = params.query.authToken;
    if (loginToken) {
      const hashToken = Accounts._hashLoginToken(loginToken);
-      user = Meteor.users.findOne({
+      user = ReactiveCache.getUser({
        'services.resume.loginTokens.hashedToken': hashToken,
      });
      adminId = user._id.toString();
-      impersonateDone = ImpersonatedUsers.findOne({
-        adminId: adminId,
-      });
+      impersonateDone = ReactiveCache.getImpersonatedUser({ adminId: adminId });
    } else if (!Meteor.settings.public.sandstorm) {
      Authentication.checkUserId(req.userId);
-      user = Users.findOne({
+      user = ReactiveCache.getUser({
        _id: req.userId,
        isAdmin: true,
      });
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
 import { runOnServer } from './runOnServer';

@@ -39,16 +40,14 @@ runOnServer(function() {
    const loginToken = params.query.authToken;
    if (loginToken) {
      const hashToken = Accounts._hashLoginToken(loginToken);
-      user = Meteor.users.findOne({
+      user = ReactiveCache.getUser({
        'services.resume.loginTokens.hashedToken': hashToken,
      });
      adminId = user._id.toString();
-      impersonateDone = ImpersonatedUsers.findOne({
-        adminId: adminId,
-      });
+      impersonateDone = ReactiveCache.getImpersonatedUser({ adminId: adminId });
    } else if (!Meteor.settings.public.sandstorm) {
      Authentication.checkUserId(req.userId);
-      user = Users.findOne({
+      user = ReactiveCache.getUser({
        _id: req.userId,
        isAdmin: true,
      });
@@ -1,3 +1,4 @@
+import { ReactiveCache } from '/imports/reactiveCache';
 import moment from 'moment/min/moment-with-locales';
 const Papa = require('papaparse');
 import { TAPi18n } from '/imports/i18n';
@@ -34,7 +35,7 @@ export class Exporter {
    };
    _.extend(
      result,
-      Boards.findOne(this._boardId, {
+      ReactiveCache.getBoard(this._boardId, {
        fields: {
          stars: 0,
        },
@@ -76,8 +77,7 @@ export class Exporter {
    const byBoardAndAttachment = this._attachmentId
      ? { boardId: this._boardId, _id: this._attachmentId }
      : byBoard;
-    result.attachments = Attachments.find(byBoardAndAttachment)
-      .fetch()
+    result.attachments = ReactiveCache.getAttachments(byBoardAndAttachment)
      .map((attachment) => {
        let filebase64 = null;
        filebase64 = getBase64DataSync(attachment);
@@ -96,16 +96,16 @@ export class Exporter {
      return result.attachments.length > 0 ? result.attachments[0] : {};
    }

-    result.lists = Lists.find(byBoard, noBoardId).fetch();
-    result.cards = Cards.find(byBoardNoLinked, noBoardId).fetch();
-    result.swimlanes = Swimlanes.find(byBoard, noBoardId).fetch();
-    result.customFields = CustomFields.find(
+    result.lists = ReactiveCache.getLists(byBoard, noBoardId);
+    result.cards = ReactiveCache.getCards(byBoardNoLinked, noBoardId);
+    result.swimlanes = ReactiveCache.getSwimlanes(byBoard, noBoardId);
+    result.customFields = ReactiveCache.getCustomFields(
      { boardIds: this._boardId },
      { fields: { boardIds: 0 } },
-    ).fetch();
-    result.comments = CardComments.find(byBoard, noBoardId).fetch();
-    result.activities = Activities.find(byBoard, noBoardId).fetch();
-    result.rules = Rules.find(byBoard, noBoardId).fetch();
+    );
+    result.comments = ReactiveCache.getCardComments(byBoard, noBoardId);
+    result.activities = ReactiveCache.getActivities(byBoard, noBoardId);
+    result.rules = ReactiveCache.getRules(byBoard, noBoardId);
    result.checklists = [];
    result.checklistItems = [];
    result.subtaskItems = [];
@@ -113,37 +113,37 @@ export class Exporter {
    result.actions = [];
    result.cards.forEach((card) => {
      result.checklists.push(
-        ...Checklists.find({
+        ...ReactiveCache.getChecklists({
          cardId: card._id,
-        }).fetch(),
+        }),
      );
      result.checklistItems.push(
-        ...ChecklistItems.find({
+        ...ReactiveCache.getChecklistItems({
          cardId: card._id,
-        }).fetch(),
+        }),
      );
      result.subtaskItems.push(
-        ...Cards.find({
+        ...ReactiveCache.getCards({
          parentId: card._id,
-        }).fetch(),
+        }),
      );
    });
    result.rules.forEach((rule) => {
      result.triggers.push(
-        ...Triggers.find(
+        ...ReactiveCache.getTriggers(
          {
            _id: rule.triggerId,
          },
          noBoardId,
-        ).fetch(),
+        ),
      );
      result.actions.push(
-        ...Actions.find(
+        ...ReactiveCache.getActions(
          {
            _id: rule.actionId,
          },
          noBoardId,
-        ).fetch(),
+        ),
      );
    });

@@ -191,8 +191,7 @@ export class Exporter {
        'profile.avatarUrl': 1,
      },
    };
-    result.users = Users.find(byUserIds, userFields)
-      .fetch()
+    result.users = ReactiveCache.getUsers(byUserIds, userFields)
      .map((user) => {
        // user avatar is stored as a relative url, we export absolute
        if ((user.profile || {}).avatarUrl) {
@@ -379,7 +378,7 @@ export class Exporter {
  }

  canExport(user) {
-    const board = Boards.findOne(this._boardId);
+    const board = ReactiveCache.getBoard(this._boardId);
    return board && board.isVisibleBy(user);
  }
 }
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 Integrations = new Mongo.Collection('integrations');

 /**
@@ -100,9 +102,9 @@ Integrations.Const = {
 };
 const permissionHelper = {
  allow(userId, doc) {
-    const user = Users.findOne(userId);
-    const isAdmin = user && Meteor.user().isAdmin;
-    return isAdmin || allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+    const user = ReactiveCache.getUser(userId);
+    const isAdmin = user && ReactiveCache.getCurrentUser().isAdmin;
+    return isAdmin || allowIsBoardAdmin(userId, ReactiveCache.getBoard(doc.boardId));
  },
 };
 Integrations.allow({
@@ -140,7 +142,7 @@ if (Meteor.isServer) {
      const paramBoardId = req.params.boardId;
      Authentication.checkBoardAccess(req.userId, paramBoardId);

-      const data = Integrations.find(
+      const data = ReactiveCache.getIntegrations(
        { boardId: paramBoardId },
        { fields: { token: 0 } },
      ).map(function(doc) {
@@ -175,7 +177,7 @@ if (Meteor.isServer) {

      JsonRoutes.sendResult(res, {
        code: 200,
-        data: Integrations.findOne(
+        data: ReactiveCache.getIntegration(
          { _id: paramIntId, boardId: paramBoardId },
          { fields: { token: 0 } },
        ),
@@ -322,7 +324,7 @@ if (Meteor.isServer) {

        JsonRoutes.sendResult(res, {
          code: 200,
-          data: Integrations.findOne(
+          data: ReactiveCache.getIntegration(
            { _id: paramIntId, boardId: paramBoardId },
            { fields: { _id: 1, activities: 1 } },
          ),
@@ -362,7 +364,7 @@ if (Meteor.isServer) {

        JsonRoutes.sendResult(res, {
          code: 200,
-          data: Integrations.findOne(
+          data: ReactiveCache.getIntegration(
            { _id: paramIntId, boardId: paramBoardId },
            { fields: { _id: 1, activities: 1 } },
          ),
@@ -1,3 +1,5 @@
+import { ReactiveCache } from '/imports/reactiveCache';
+
 InvitationCodes = new Mongo.Collection('invitation_codes');

 InvitationCodes.attachSchema(
@@ -54,7 +56,7 @@ InvitationCodes.attachSchema(

 InvitationCodes.helpers({
  author() {
-    return Users.findOne(this.authorId);
+    return ReactiveCache.getUser(this.authorId);
  },
 });