Removed cache stuff for now, will do it later.