[U] Cache numericGrade

src/logic/course.ts

@@ -193,29 +193,24 @@ export default class Course
         })
     }
 
-    private _cacheNumericGrade: number;
-
     /**
      * Get numeric grade
      */
     get numericGrade(): number
     {
-        // Cached
+        return this.cache.get('NumericGrade', () =>
-        if (this._cacheNumericGrade == null)
         {
             // Calculate
             if (this.grading.method == 'PERCENT_TYPE')
             {
-                this._cacheNumericGrade = GPAUtils.getPercentTypeAverage(this, this.assignments);
+                return GPAUtils.getPercentTypeAverage(this, this.assignments);
             }
             else if (this.grading.method == 'TOTAL_MEAN')
             {
-                this._cacheNumericGrade = GPAUtils.getTotalMeanAverage(this.assignments);
+                return GPAUtils.getTotalMeanAverage(this.assignments);
             }
-            else this._cacheNumericGrade = -1;
+            else return -1;
-        }
+        })
-
-        return this._cacheNumericGrade;
     }
 
     private _cacheAssignmentTypes: AssignmentType[];