Added persistent cache draft