Add support for caching
v0.3.5