Ehcache foundation

More work around foundational stuff