reinabled caching
made entire test suite passing on new API