Add cache support for recovery