Big update, caching model almost working