caching

fixed few minor issues with managing cache
we are forcing to cache videos (ignoring shouldCacheVideo flag for now)