Merge from 1.3 cache engine.