added cache and logs