Caching finally works I think.