diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index b9649da74..c61e9559a 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1732,13 +1732,11 @@ define([
                     postMessage(clientId, "PAD_CACHE");
                 },
                 onCacheReady: function () {
-                    channel.hasCache = true;
                     postMessage(clientId, "PAD_CACHE_READY");
                 },
                 onReady: function (pad) {
                     var padData = pad.metadata || {};
                     channel.data = padData;
-                    channel.ready = true;
                     if (padData && padData.validateKey && store.messenger) {
                         store.messenger.storeValidateKey(data.channel, padData.validateKey);
                     }
diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index 742836fb9..7eb618d63 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -187,7 +187,7 @@ define([
                 team.rpc = call;
                 team.onRpcReadyEvt.fire();
                 cb();
-            });
+            }, Cache);
         });
     };