Cache updated - Some bugs still need to be fixed