BUG: Add missing initial cache variables