Revert "Merge pull request #311 from kaltura/cacheFixes"

This reverts commit c0fd12f680532dacc7bc52b2d498e7c8a6034381, reversing
changes made to d960a697e2bcc825f074491b1425ac2ce7d4d6be.