Cache watermark
Merge pull request #3 from guywithnose/master

Cache watermark