[Misc] Add cache