Returning Optional from cache as CacheLoader does not like null values.

Fixes #684
Merge branch 'master' of github.com:Graylog2/graylog2-server