remove caching for performance