fixed cache invalidation!