Implement caching and nudge to 0.0.4