Add invoice type, fix caching recalling callback bug