Fix caching of ontology lookups
Update to version v537
Merge branch 'master' into testing