fix Type and Cache