[9] Added cache directory as optional configuration setting
[9] Added caching to disk list service
[] Refactored system gateway mock verifying
[9] Removed TODO