Started cache. Fixed some design issues