Minor fixes, cache invalidation