PLA-984 fixed cache
PLA-984 fixed output params
Merge branch 'PLA-984' into PLA-985