Issue #1962358 by larowlan: Cache service