Performance fix, removed caching to cut down on excessive memory usage.