Implemented simple change in the source of generated names of cache data files: from an SQL query to the query's corresponding indicator's name. See previous commit's comment on the reason for this change. Additional positive side effect of this is much shorter file names and, thus, easier to maintain environment.