Revert "Fix category extra and invalidate cache"

This reverts commit 215deba995399d40645fabb3d6faf86ea63a2dd4.