cache headers & potential memory leak
Merge pull request #25 from craigspaeth/master

Cache headers & fix potential memory leak