Add cache support