Add a better notion of caching (i.e. any notion at all, as there was no such thing before).