Fix for issue #69 (NPEs when serializing cache)
Merge pull request #70 from chuckdumont/master

Fix for issue #69 (NPEs when serializing cache)