Removed caching, as it was half-baked