cache: Fix some data types mismatching with their sources.
7 files changed