improved cache strategy for media (and resolved some svn merge error)