Fix bug in Caching 
Signed-off-by: tomer1 <tomer.morisi@gmail.com>