gustafn
committed
on 27 Dec
backport from oacs-head, otherwise the cache viewer is unusuable