Add guava caching and fix NPE
Merge pull request #777 from msteiger/develop

Added Guava Caching to module API, and fixed a possible NPE.