cleaned up some calls to cache