Revert "Added cache, still bugs"

This reverts commit 05511fb1e85415aec3fd241a45e35be37d69d482.