Added 2nd level cache. fixes #153