(#2557) Temp fix till new cache system fully tested