Issue 11: Missing unit test skipping timestamp test in cacheOnly mode
Merge remote-tracking branch 'larsblockken/issue-11'
Cleaning change from 90402aedd2b824e79257ffe961f3146db65cb289