* 539 (bug) - Caching of hierachical ref data doesn't account for 2 return types