removed caching for testing