Fix caching

This pull-request brings a couple of fixes around the change made by @ralphbean to enable caching the information retrieved from FAS to speed things up