more slight changes to restore non caching functions