Removed caching of draft