Merge branch 'jm/cache-entry-from-mem-pool'