CLN: bring back the cache