HM: Removed test; untestable caching..