fixing the way caching is handled, making a huge mess of things
bumping version