Add value cache support on model
Code clean