#7: Fixed outputcache breaking changes and fixed mediapicker issue.