Added Cache capability