diff --git a/app/Http/Controllers/VendorController.php b/app/Http/Controllers/VendorController.php
index e89c0028f738..828cb9f542ba 100644
--- a/app/Http/Controllers/VendorController.php
+++ b/app/Http/Controllers/VendorController.php
@@ -152,7 +152,6 @@ class VendorController extends BaseController
             'data' => Input::old('data'),
             'account' => Auth::user()->account,
             'currencies' => Cache::get('currencies'),
-            'countries' => Cache::get('countries'),
         ];
     }
 
diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php
index 5d8e1bcc577b..f20211cee4bc 100644
--- a/app/Providers/ComposerServiceProvider.php
+++ b/app/Providers/ComposerServiceProvider.php
@@ -17,9 +17,11 @@ class ComposerServiceProvider extends ServiceProvider
             [
                 'accounts.details',
                 'clients.edit',
+                'vendors.edit',
                 'payments.edit',
                 'invoices.edit',
                 'accounts.localization',
+                'payments.credit_card',
             ],
             'App\Http\ViewComposers\TranslationComposer'
         );
diff --git a/resources/views/payments/credit_card.blade.php b/resources/views/payments/credit_card.blade.php
index 29d7c9ace5f7..316fd4602aaa 100644
--- a/resources/views/payments/credit_card.blade.php
+++ b/resources/views/payments/credit_card.blade.php
@@ -193,7 +193,7 @@
             <div class="col-md-6">
                 {!! Former::select('country_id')
                         ->placeholder(trans('texts.country_id'))
-                        ->fromQuery(Cache::get('countries'), 'name', 'id')
+                        ->fromQuery($countries, 'name', 'id')
                         ->addGroupClass('country-select')
                         ->label('') !!}
             </div>