Fixed caching issue #147