Put back an in-memory cache (see 1ee93d622e10d6c2d788faeadaa2bf39232bcb11)