Removed caching stuff, needs to be re-written