Get rid of caching logic
0.0.3