applied patch
convert to cache collector
fix stupid mistakes
applied missing interdiff