Fix Persistence\Cache for location handler draft support change