Removed caching as it was acting up.