Added a parameter to bypass the heap cache