Bug Fix: added cache v3