Add cache support (close FS#40754)

git-svn-id: file:///srv/repos/svn-packages/svn@219290 eb2447ed-0c53-47e4-bac8-5bc4a241df78