Added path and caching to ScreenInfo
Merge remote-tracking branch 'upstream/master'