Removed caching for now, brought too many problems.