Possible correction for caching orgId issue and additional logging