Removed caching that was causing more problems than helping