Added cache, still bugs