Add cache supporting