[#44528397] Add view cache, fixes