Added channel cache support