added draft cache methods (needs reviewal)