Fix caching problems; updating doesn't yet work