Added cache decorator
Added cache decorator
Merge pull request #7 from artpard/bug_2190_fixed

Added cache decorator
Fixed conflicts