Refactoring of temp. audio caching system.