cleanup
Merge pull request #79 from yogthos/master

cache fixes