Cache watermark
Merge pull request #57 from guywithnose/master

Cache watermark