Minor changes in cache layer.