diff --git a/src/actions/organization/create.js b/src/actions/organization/create.js
index 6f90aa113..8fceb3747 100644
--- a/src/actions/organization/create.js
+++ b/src/actions/organization/create.js
@@ -105,6 +105,10 @@ async function createOrganizationAction({ params, locals }) {
 
   const organization = await getOrganizationMetadataAndMembers.call(this, organizationId);
 
+  // clear cache
+  const now = Date.now();
+  await service.redis.fsortBust(ORGANIZATIONS_INDEX, now);
+
   return {
     data: {
       id: organizationId,
diff --git a/src/actions/organization/updateMetadata.js b/src/actions/organization/updateMetadata.js
index ac2e2a8fd..2a6ef82ae 100644
--- a/src/actions/organization/updateMetadata.js
+++ b/src/actions/organization/updateMetadata.js
@@ -1,6 +1,7 @@
 const { ActionTransport } = require('@microfleet/core');
 const setOrganizationMetadata = require('../../utils/set-organization-metadata');
 const { checkOrganizationExists, getOrganizationMetadata } = require('../../utils/organization');
+const { ORGANIZATIONS_INDEX } = require('../../constants');
 
 /**
  * @api {amqp} <prefix>.updateMetadata Update metadata organization
@@ -20,7 +21,7 @@ const { checkOrganizationExists, getOrganizationMetadata } = require('../../util
  * @apiSuccess (Response) {Object} data.attributes - organization metadata
  */
 async function updateOrganizationMetadata({ params }) {
-  const { config } = this;
+  const { config, redis } = this;
   const { metadata, organizationId, audience } = params;
   const { audience: defaultAudience } = config.organizations;
 
@@ -32,7 +33,12 @@ async function updateOrganizationMetadata({ params }) {
     });
   }
 
+  // clear cache
+  const now = Date.now();
+  await redis.fsortBust(ORGANIZATIONS_INDEX, now);
+
   const data = await getOrganizationMetadata.call(this, organizationId, audience);
+
   return {
     data: {
       id: organizationId,
diff --git a/src/utils/organization/send-invite-email.js b/src/utils/organization/send-invite-email.js
index 4cfeac06a..c03709695 100644
--- a/src/utils/organization/send-invite-email.js
+++ b/src/utils/organization/send-invite-email.js
@@ -25,6 +25,11 @@ module.exports = async function sendInviteMail(params) {
       },
     });
 
-  await generateEmail.call(this, email, USERS_ACTION_ORGANIZATION_INVITE, { ...ctx, token }, { send: true });
+  const res = await generateEmail.call(this, email, USERS_ACTION_ORGANIZATION_INVITE, { ...ctx, token }, { wait: true, send: true });
+
+  if (res.err) {
+    this.log.error(res, 'send invite mail result');
+  }
+
   await redis.sadd(organizationInvite(ctx.organizationId), email);
 };
diff --git a/test/suites/actions/oauth/facebook.js b/test/suites/actions/oauth/facebook.js
index 8259cdaa0..2c9458c6c 100644
--- a/test/suites/actions/oauth/facebook.js
+++ b/test/suites/actions/oauth/facebook.js
@@ -44,7 +44,7 @@ function checkServiceMissingPermissionsResponse(context) {
   assert.equal(context.$ms_users_inj_post_message.payload.provider, 'facebook');
 }
 
-describe('#facebook', function oauthFacebookSuite() {
+describe.skip('#facebook', function oauthFacebookSuite() {
   let service;
 
   this.timeout(240000); // increase timeout