Reduce number of API calls required by making sure the right fields are cached