chore(cache): Move simplecache and system cache into OO services
Merge pull request #7439 from ewinslow/oo-cache

chore(cache): Move simplecache and system cache into OO services