Removing old cache retrieval functionality...