diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php
index 345800e4e4..dcd9a867f1 100644
--- a/app/Repositories/Account/AccountRepository.php
+++ b/app/Repositories/Account/AccountRepository.php
@@ -16,7 +16,6 @@ use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Query\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Log;
@@ -118,7 +117,13 @@ class AccountRepository implements AccountRepositoryInterface
      */
     public function getCreditCards(Carbon $date)
     {
-        return Auth::user()->accounts()
+        $cache = new CacheProperties();
+        $cache->addProperty('user-credit-cards');
+        if ($cache->has()) {
+            return $cache->get();
+        }
+
+        $set = Auth::user()->accounts()
                    ->hasMetaValue('accountRole', 'ccAsset')
                    ->hasMetaValue('ccType', 'monthlyFull')
                    ->leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
@@ -134,6 +139,9 @@ class AccountRepository implements AccountRepositoryInterface
                            DB::Raw('SUM(`transactions`.`amount`) AS `balance`')
                        ]
                    );
+        $cache->store($set);
+
+        return $set;
     }
 
     /**
diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php
index 6935b5d3bf..8d96e141e2 100644
--- a/app/Repositories/Bill/BillRepository.php
+++ b/app/Repositories/Bill/BillRepository.php
@@ -411,7 +411,7 @@ class BillRepository implements BillRepositoryInterface
         $cache->addProperty($end);
         $cache->addProperty('bills-paid-in-range');
         if ($cache->has()) {
-            //return $cache->get(); // @codeCoverageIgnore
+            return $cache->get(); // @codeCoverageIgnore
         }
         $amount = '0';
         $bills  = $this->getActiveBills();
@@ -472,7 +472,7 @@ class BillRepository implements BillRepositoryInterface
         $cache->addProperty($end);
         $cache->addProperty('bills-unpaid-in-range');
         if ($cache->has()) {
-            //return $cache->get(); // @codeCoverageIgnore
+            return $cache->get(); // @codeCoverageIgnore
         }
         $amount = '0';
         $bills  = $this->getActiveBills();
@@ -519,7 +519,7 @@ class BillRepository implements BillRepositoryInterface
         $cache->addProperty($end);
         $cache->addProperty('credit-card-bill');
         if ($cache->has()) {
-            //return $cache->get(); // @codeCoverageIgnore
+            return $cache->get(); // @codeCoverageIgnore
         }
         /** @var AccountRepositoryInterface $accountRepository */
         $accountRepository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');