Split up the cache handling function and added some comments to the implementation of ticket #354
Authored by: numere 2019-06-12
Parent: [r564]
Child: [r566]