CLC-3369 Move FinAid caching from proxy to model layer
CLC-3369 Make test pass
Merge pull request #2209 from ctweney/clc-3369

CLC-3369 Improve FinAid performance