Added cache decorator
Fixed conflicts
Merge remote-tracking branch 'upstream/master'
Fixed decorator
Merge pull request #9 from artpard/bug_2190_cache_fix

Bug 2190 cache fix