caching
Merge pull request #2 from Pathologic/master

caching