Improved cast management