Fixing salesforce api instance and cache settings