MAID-17
Removed chache handling as not used in this version. May bew introduced later